Quick Fix

* AB: Fix to carrion swarm to not deal 0 damage
* Core: Fix to pseudo projectiles to properly reduce wave distance in edge cases

Author: Glasislundr

core/assets/abilityBehaviors/undeadHeroUnitActives.json

@@ -210,7 +210,7 @@
 				}
 		}]
 	},{
-		"ids": [{"id":"AUcs", "castId": "carrionswarm"}],
+		"ids": [{"id":"AUcs", "castId": "carrionswarm"},{"id":"AOsh", "castId": "shockwave"}],
 		"type": "NORMAL_POINTTARGET_SIMPLE",
 		"onBeginCasting": [{
 			"type": "createLocationTargetedCollisionProjectile",
@@ -386,39 +386,39 @@
 						}
 					},
 					"thenActions": [{
-						"type": "createTemporarySpellEffectOnUnit",
-						"target": {
-							"type": "getProjectileHitUnit"
-						},
-						"id": {
-							"type": "getAlias"
-						},
-						"effectType": "SPECIAL"
+							"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": []
-				},{
-					"type": "damageTarget",
-					"source": {
-						"type": "getCastingUnit"
-					},
-					"target": {
-						"type": "getProjectileHitUnit"
-					},
-					"damageType": {
-						"type": "getDamageTypeFromString",
-						"id": {
-							"type": "rawString",
-							"value": "DISEASE"
-						}
-					},
-					"damage": {
-						"type": "getStoredFloatByKey",
-						"key": {
-							"type": "rawString",
-							"value": "dpt"
-						}
-					}
-			}]
+				}]
 		}]
 
 	},{

core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilitySpellBase.java

@@ -41,7 +41,7 @@ public CAbilitySpellBase(final int handleId, final War3ID alias) {
 	public final void populate(final MutableGameObject worldEditorAbility, final int level) {
 		this.manaCost = worldEditorAbility.getFieldAsInteger(AbilityFields.MANA_COST, level);
 		this.castRange = worldEditorAbility.getFieldAsFloat(AbilityFields.CAST_RANGE, level);
-		this.cooldown = worldEditorAbility.readSLKTagFloat("Cool" + level);
+		this.cooldown = worldEditorAbility.getFieldAsFloat(AbilityFields.COOLDOWN, level);
 		this.castingTime = worldEditorAbility.getFieldAsFloat(AbilityFields.CASTING_TIME, level);
 		int requiredLevel = worldEditorAbility.getFieldAsInteger(AbilityFields.REQUIRED_LEVEL, 0);
 

core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java

@@ -23,13 +23,17 @@ public class ABActionDamageTarget implements ABAction {
 	private ABAttackTypeCallback attackType;
 	private ABDamageTypeCallback damageType;
 	private ABFloatCallback damage;
+	
+	private ABBooleanCallback ignoreLTEZero;
 
 	@Override
 	public void runAction(CSimulation game, CUnit caster, Map<String, Object> localStore, final int castId) {
 		boolean isItAttack = false;
 		boolean isItRanged = true;
 		CAttackType theAttackType = CAttackType.SPELLS;
 		CDamageType theDamageType = CDamageType.MAGIC;
+		
+		float theDamage = damage.callback(game, caster, localStore, castId);
 
 		if (isAttack != null) {
 			isItAttack = isAttack.callback(game, caster, localStore, castId);
@@ -43,10 +47,11 @@ public void runAction(CSimulation game, CUnit caster, Map<String, Object> localS
 		if (damageType != null) {
 			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(),
-				damage.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));
+		}
 	}
 
 }

core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CPsuedoProjectile.java

@@ -81,12 +81,12 @@ public CPsuedoProjectile(final float x, final float y, final float speed, final
 
 		final float d1x = dtsx / this.distanceToTarget;
 		final float d1y = dtsy / this.distanceToTarget;
+		this.steps = ((int)Math.round(this.distanceToTarget) / (int)speed) + 1;
 
-		float travelDistance = Math.min(speed, distanceToTarget);
+		float travelDistance = Math.min(speed, distanceToTarget/this.steps);
 
 		this.dx = d1x * travelDistance;
 		this.dy = d1y * travelDistance;
-		this.steps = ((int)Math.round(this.distanceToTarget) / (int)speed) + 1;
 
 		this.stepInterval = (int) (projectileStepInterval / WarsmashConstants.SIMULATION_STEP_TIME);
 		this.artSkip = projectileArtSkip;