Damage Engine Fixed (#417)

* Fixed DamageEvent and other stuff

Author: HerlySQR

wurst/_handles/Camera.wurst

@@ -252,22 +252,23 @@ public function player.adjustCameraBounds(CameraBoundsAdjust adjustMethod, real
 			printLog(Loglevel.WARNING, "Unrecognized adjustment method, request ignored.")
 			return
 
-	// Adjust the actual camera values
-	var minX = GetCameraBoundMinX() - scale * dxWest
-	var maxX = GetCameraBoundMaxX() + scale * dxEast
-	var minY = GetCameraBoundMinY() - scale * dySouth
-	var maxY = GetCameraBoundMaxY() + scale * dyNorth
-
-	// Make sure the camera bounds are still valid.
-	if maxX < minX
-		minX = minX + maxX * 0.5
-		maxX = minX
-	if maxY < minY
-		minY = (minY + maxY) * 0.5
-		maxY = minY
-
-	// Apply the new camera values.
-	SetCameraBounds(minX, minY, minX, maxY, maxX, maxY, maxX, minY)
+	if this == localPlayer
+		// Adjust the actual camera values
+		var minX = GetCameraBoundMinX() - scale * dxWest
+		var maxX = GetCameraBoundMaxX() + scale * dxEast
+		var minY = GetCameraBoundMinY() - scale * dySouth
+		var maxY = GetCameraBoundMaxY() + scale * dyNorth
+
+		// Make sure the camera bounds are still valid.
+		if maxX < minX
+			minX = minX + maxX * 0.5
+			maxX = minX
+		if maxY < minY
+			minY = (minY + maxY) * 0.5
+			maxY = minY
+
+		// Apply the new camera values.
+		SetCameraBounds(minX, minY, minX, maxY, maxX, maxY, maxX, minY)
 
 /** Set the position the camera will go when you press the space-bar */
 public function player.setCameraQuickPosition(vec2 pos)

wurst/_handles/Destructable.wurst

@@ -1,8 +1,8 @@
 package Destructable
 import NoWurst
-import Vectors
 import Wurstunit
 import Annotations
+import Vectors
 
 public function createDestructable(int id, vec3 pos, angle direction, real scale, int variation) returns destructable
 	return createDestructable(id, pos.toVec2(), direction, scale, variation)

wurst/_handles/Force.wurst

@@ -66,6 +66,14 @@ public function force.has(unit whichUnit) returns bool
 public function force.has(player whichPlayer) returns bool
 	return IsPlayerInForce(whichPlayer, this)
 
+int count
+public function force.size() returns int
+	count = 0
+	this.forEach(() -> begin
+		count++
+	end)
+	return count
+
 /* Force iterator */
 force iterForce
 

wurst/_handles/Group.wurst

@@ -56,7 +56,7 @@ public function group.addUnit(vararg unit units)
 	for u in units
 		this.add(u)
 
-/** Retruns the number of removed units. */
+/** Returns the number of removed units. */
 public function group.remove(vararg unit units) returns int
 	var i = 0
 	for u in units
@@ -132,8 +132,8 @@ group mainGroup
 int count
 
 public function group.add(vararg group groups) returns int
-	// I had to do it in this way because I can't use the "for u in g" is using a recursion,
-	// because it needs the function .iterator(), but that needs this function first
+	// I had to do it in this way because I can't use the "for u in g" cause is using a recursion,
+	// since it needs the function .iterator(), but that needs this function first
 
 	mainGroup = this
 	count = 0

wurst/_handles/Trigger.wurst

@@ -87,9 +87,6 @@ public function trigger.registerPlayerUnitEvent(player whichPlayer, playerunitev
 public function trigger.registerPlayerAllianceChange(player whichPlayer, alliancetype whichAlliance) returns event
 	return TriggerRegisterPlayerAllianceChange(this, whichPlayer, whichAlliance)
 
-public function trigger.registerPlayerSync(player whichPlayer, alliancetype whichAlliance) returns event
-	return TriggerRegisterPlayerAllianceChange(this, whichPlayer, whichAlliance)
-
 public function trigger.registerTimerEvent(real timeout, boolean periodic) returns event
 	return TriggerRegisterTimerEvent(this, timeout, periodic)
 

wurst/_handles/_Handles.wurst

@@ -3,6 +3,7 @@ import NoWurst
 import public _Primitives
 
 import public Boolexpr
+import public Camera
 import public Destructable
 import public Effect
 import public Fogmodifier

wurst/event/DamageEvent.wurst

@@ -72,7 +72,7 @@ package DamageEvent
 import DamageDetection
 import OnUnitEnterLeave
 import ClosureForGroups
-import TimerUtils
+import ClosureTimers
 import LinkedList
 import ErrorHandling
 import AbilityObjEditing
@@ -158,7 +158,6 @@ class DamageInstance
     protected DamageElement damageElement
 
     protected static thistype current = null
-    protected static thistype array stack
     protected static int count = 0
 
     protected real lastDamageHP = 0.00
@@ -178,8 +177,6 @@ class DamageInstance
         this.damageElement = damageElement
 
         count++
-        stack[count] = this
-        current = this
 
     protected function setAmount(real amount)
         this.amount = amount
@@ -193,7 +190,6 @@ class DamageInstance
 
     ondestroy
         count--
-        current = stack[count]
 
 
 /* DAMAGE EVENT */
@@ -250,7 +246,10 @@ public class DamageEvent
         for i = 0 to maxUnreducedPriority
             var listener = firstUnreducedListeners[i]
             while listener != null
+                let prev = DamageInstance.current
+                DamageInstance.current = dmg
                 listener.onEvent()
+                DamageInstance.current = prev
                 if abort
                     dmg.amount = 0
                     break
@@ -259,6 +258,11 @@ public class DamageEvent
             if abort
                 break
 
+        if amount == 0.
+            destroy dmg
+            recursion--
+            return
+        
         // All events have run and the damage amount is finalized.
         var life = target.getLife()
         let maxHP = target.getMaxHP()
@@ -285,11 +289,14 @@ public class DamageEvent
                     target.addAbility(DAMAGE_ABIL_ID)
                 target.setLife(max(life, 0.42))
 
-            getTimer().start(0., function onDamage)
+            nullTimer() ->
+                DamageInstance.current = dmg
+                onDamage()
 
     private static function onTrg()
         for damage in damageList
             if damage.target == GetTriggerUnit()
+                DamageInstance.current = damage
                 onDamage()
                 damageList.remove(damage)
         dmgTrg.clearActions()
@@ -315,7 +322,10 @@ public class DamageEvent
             for i = 0 to maxPriority
                 var listener = firstListeners[i]
                 while listener != null
+                    let prev = DamageInstance.current
+                    DamageInstance.current = dmg
                     listener.onEvent()
+                    DamageInstance.current = prev
                     if abort
                         dmg.amount = 0
                         break