Skip to content

Commit 581538c

Browse files
GlasislundrGlasislundr
authored
Merge pull request #5 from Glasislundr/abilitybuilder
Abilitybuilder
2 parents faac01d + e82d612 commit 581538c

File tree

450 files changed

+17694
-9257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

450 files changed

+17694
-9257
lines changed

‎core/assets/abilityBehaviors/RaiseDead.json‎

Lines changed: 1104 additions & 0 deletions
Large diffs are not rendered by default.

‎core/assets/abilityBehaviors/generalPassives.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,13 @@
234234
"condition": {
235235
"type": "and",
236236
"condition1": {
237-
"type": "isValidTarget",
237+
"type": "isUnitValidTarget",
238238
"target": {
239239
"type": "getAttackedUnit"
240240
}
241241
},
242242
"condition2": {
243-
"type": "floatLt",
243+
"type": "f<",
244244
"value1": {
245245
"type": "randomBoundedFloat",
246246
"bound": {
@@ -257,7 +257,7 @@
257257
"thenActions": [{
258258
"type": "if",
259259
"condition": {
260-
"type": "floatNe0",
260+
"type": "f!=0",
261261
"value": {
262262
"type": "getAbilityDataAsFloat",
263263
"dataField": "B"
@@ -374,7 +374,7 @@
374374
},{
375375
"type": "createEvasionListener",
376376
"conditions": [{
377-
"type": "floatLt",
377+
"type": "f<",
378378
"value1": {
379379
"type": "randomFloat"
380380
},
@@ -439,7 +439,7 @@
439439
"onAddAbility": [{
440440
"type": "createEvasionListener",
441441
"conditions": [{
442-
"type": "floatLt",
442+
"type": "f<",
443443
"value1": {
444444
"type": "randomFloat"
445445
},
@@ -514,7 +514,7 @@
514514
"actions": [{
515515
"type": "setHp",
516516
"target": {
517-
"type": "getCastingUnit"
517+
"type": "getListenerUnit"
518518
},
519519
"amount": {
520520
"type": "rawFloat",

‎core/assets/abilityBehaviors/humanHeroActives.json‎

Lines changed: 86 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
"ids": [{"id":"AHfs", "castId": "flamestrike"}],
44
"type": "NORMAL_POINTTARGET",
55
"onBeginCasting": [{
6+
"type": "storeValueLocally",
7+
"key": {
8+
"type": "rawString",
9+
"value": "targetLoc"
10+
},
11+
"valueToStore": {
12+
"type": "getTargetedLocation"
13+
}
14+
},{
615
"type": "createTemporarySpellEffectAtLocation",
716
"location": {
817
"type": "getTargetedLocation"
@@ -21,6 +30,37 @@
2130
"type": "getAlias"
2231
},
2332
"effectType": "SPECIAL"
33+
},{
34+
"type": "iterateDestructablesInRangeOfLocation",
35+
"location": {
36+
"type": "getTargetedLocation"
37+
},
38+
"range": {
39+
"type": "getAbilityArea"
40+
},
41+
"iterationActions": [{
42+
"type": "if",
43+
"condition": {
44+
"type": "isDestructableValidTarget",
45+
"target": {
46+
"type": "getEnumDestructable"
47+
}
48+
},
49+
"thenActions": [{
50+
"type": "damageDestructable",
51+
"source": {
52+
"type": "getCastingUnit"
53+
},
54+
"target": {
55+
"type": "getEnumDestructable"
56+
},
57+
"damage": {
58+
"type": "rawFloat",
59+
"value": 512
60+
}
61+
}],
62+
"elseActions": []
63+
}]
2464
},{
2565
"type": "createTimer",
2666
"timeout": {
@@ -50,7 +90,7 @@
5090
"valueToStore": {
5191
"type": "randomBoundedFloat",
5292
"bound": {
53-
"type": "*",
93+
"type": "f*",
5494
"value1": {
5595
"type": "pi"
5696
},
@@ -67,7 +107,7 @@
67107
"value": "randDist"
68108
},
69109
"valueToStore": {
70-
"type": "multiplyFloat",
110+
"type": "f*",
71111
"value1": {
72112
"type": "randomFloat"
73113
},
@@ -78,15 +118,19 @@
78118
},{
79119
"type": "createTemporarySpellEffectAtPoint",
80120
"x": {
81-
"type": "+",
121+
"type": "f+",
82122
"value1": {
83123
"type": "getLocationX",
84124
"location": {
85-
"type": "getTargetedLocation"
125+
"type": "getStoredLocationByKey",
126+
"key": {
127+
"type": "rawString",
128+
"value": "targetLoc"
129+
}
86130
}
87131
},
88132
"value2": {
89-
"type": "*",
133+
"type": "f*",
90134
"value1": {
91135
"type": "cos",
92136
"angle": {
@@ -107,15 +151,19 @@
107151
}
108152
},
109153
"y": {
110-
"type": "+",
154+
"type": "f+",
111155
"value1": {
112156
"type": "getLocationY",
113157
"location": {
114-
"type": "getTargetedLocation"
158+
"type": "getStoredLocationByKey",
159+
"key": {
160+
"type": "rawString",
161+
"value": "targetLoc"
162+
}
115163
}
116164
},
117165
"value2": {
118-
"type": "*",
166+
"type": "f*",
119167
"value1": {
120168
"type": "sin",
121169
"angle": {
@@ -171,13 +219,13 @@
171219
"value": "damageDealt"
172220
},
173221
"valueToStore": {
174-
"type": "minFloat",
222+
"type": "fMin",
175223
"value1": {
176224
"type": "getAbilityDataAsFloat",
177225
"dataField": "A"
178226
},
179227
"value2": {
180-
"type": "/",
228+
"type": "f/",
181229
"value1": {
182230
"type": "getAbilityDataAsFloat",
183231
"dataField": "F"
@@ -187,7 +235,11 @@
187235
"value": {
188236
"type": "countUnitsInRangeOfLocation",
189237
"location": {
190-
"type": "getTargetedLocation"
238+
"type": "getStoredLocationByKey",
239+
"key": {
240+
"type": "rawString",
241+
"value": "targetLoc"
242+
}
191243
},
192244
"range": {
193245
"type": "getAbilityArea"
@@ -203,7 +255,7 @@
203255
"value": "buildingDamageDealt"
204256
},
205257
"valueToStore": {
206-
"type": "multiplyFloat",
258+
"type": "f*",
207259
"value1": {
208260
"type": "getStoredFloatByKey",
209261
"key": {
@@ -219,7 +271,11 @@
219271
},{
220272
"type": "iterateUnitsInRangeOfLocation",
221273
"location": {
222-
"type": "getTargetedLocation"
274+
"type": "getStoredLocationByKey",
275+
"key": {
276+
"type": "rawString",
277+
"value": "targetLoc"
278+
}
223279
},
224280
"range": {
225281
"type": "getAbilityArea"
@@ -336,7 +392,7 @@
336392
"value": "true"
337393
},
338394
"delay": {
339-
"type": "+",
395+
"type": "f+",
340396
"value1": {
341397
"type": "getAbilityDataAsFloat",
342398
"dataField": "D"
@@ -352,13 +408,13 @@
352408
"value": "damageDealt"
353409
},
354410
"valueToStore": {
355-
"type": "minFloat",
411+
"type": "fMin",
356412
"value1": {
357413
"type": "getAbilityDataAsFloat",
358414
"dataField": "C"
359415
},
360416
"value2": {
361-
"type": "/",
417+
"type": "f/",
362418
"value1": {
363419
"type": "getAbilityDataAsFloat",
364420
"dataField": "F"
@@ -368,7 +424,11 @@
368424
"value": {
369425
"type": "countUnitsInRangeOfLocation",
370426
"location": {
371-
"type": "getTargetedLocation"
427+
"type": "getStoredLocationByKey",
428+
"key": {
429+
"type": "rawString",
430+
"value": "targetLoc"
431+
}
372432
},
373433
"range": {
374434
"type": "getAbilityArea"
@@ -384,7 +444,7 @@
384444
"value": "buildingDamageDealt"
385445
},
386446
"valueToStore": {
387-
"type": "multiplyFloat",
447+
"type": "f*",
388448
"value1": {
389449
"type": "getStoredFloatByKey",
390450
"key": {
@@ -400,7 +460,11 @@
400460
},{
401461
"type": "iterateUnitsInRangeOfLocation",
402462
"location": {
403-
"type": "getTargetedLocation"
463+
"type": "getStoredLocationByKey",
464+
"key": {
465+
"type": "rawString",
466+
"value": "targetLoc"
467+
}
404468
},
405469
"range": {
406470
"type": "getAbilityArea"
@@ -515,13 +579,9 @@
515579
"value": "subDmgTimer"
516580
}
517581
}
582+
},{
583+
"type": "cleanUpCastInstance"
518584
}]
519-
}
520-
521-
522-
523-
524-
525-
]
585+
}]
526586
}]
527587
}

‎core/assets/abilityBehaviors/humanUnitActives.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"onAddActions": [{
9393
"type": "addNonStackingStatBuff",
9494
"targetUnit": {
95-
"type": "getCastingUnit"
95+
"type": "getBuffedUnit"
9696
},
9797
"buff": {
9898
"type": "getStoredNonStackingStatBuffByKey",
@@ -108,7 +108,7 @@
108108
},{
109109
"type": "addNonStackingStatBuff",
110110
"targetUnit": {
111-
"type": "getCastingUnit"
111+
"type": "getBuffedUnit"
112112
},
113113
"buff": {
114114
"type": "getStoredNonStackingStatBuffByKey",
@@ -125,7 +125,7 @@
125125
"onRemoveActions": [{
126126
"type": "removeNonStackingStatBuff",
127127
"targetUnit": {
128-
"type": "getCastingUnit"
128+
"type": "getBuffedUnit"
129129
},
130130
"buff": {
131131
"type": "getStoredNonStackingStatBuffByKey",
@@ -141,7 +141,7 @@
141141
},{
142142
"type": "removeNonStackingStatBuff",
143143
"targetUnit": {
144-
"type": "getCastingUnit"
144+
"type": "getBuffedUnit"
145145
},
146146
"buff": {
147147
"type": "getStoredNonStackingStatBuffByKey",
@@ -272,8 +272,7 @@
272272
"type": "getCastingUnit"
273273
},
274274
"id": {
275-
"type": "getWar3IDFromString",
276-
"id": "LEAS"
275+
"type": "getAlias"
277276
},
278277
"target": {
279278
"type": "getAbilityTargetedUnit"
@@ -461,6 +460,8 @@
461460
"value": "targetBuff"
462461
}
463462
}
463+
},{
464+
"type": "cleanUpCastInstance"
464465
}]
465466
}]
466467
}

0 commit comments

Comments
 (0)