backport more fixes

Author: Frotty

wurst/_handles/primitives/String.wurst

@@ -1,6 +1,7 @@
 package String
 import NoWurst
 import Integer
+import Maths
 
 constant charset = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 constant numberset = "0123456789"
@@ -205,6 +206,24 @@ public function string.replace(string oldSubstring, string newSubstring) returns
 			i = s.indexOf(oldSubstring, i + newSubstring.length())
 	return s
 
+/** Returns an integer result based on a lexicographic string comparison of strings s1 and s2. */
+public function stringCompare(string s1, string s2) returns int
+	let s1Len = s1.length()
+	let s2Len = s2.length()
+	for int i = 0 to min(s1Len, s2Len)
+		let char1Int = s1.charAt(i).toCharsetInt()
+		let char2Int = s2.charAt(i).toCharsetInt()
+		if char1Int < char2Int
+			return -1
+		else if char1Int > char2Int
+			return 1
+
+	if s1Len < s2Len
+		return -1
+	else if s1Len > s2Len
+		return 1
+	return 0
+
 public function string.getHash() returns int
 	return StringHash(this)
 
@@ -271,4 +290,4 @@ public class StringLines
 
 /** Returns a StringLines Object of the given string for iteration */
 public function string.toLines() returns StringLines
-	return new StringLines(this, 0, this.countOccurences("\n") + 1)
+	return new StringLines(this, 0, this.countOccurences("\n") + 1)

wurst/closures/ClosureTimers.wurst

@@ -1,5 +1,6 @@
 package ClosureTimers
 import NoWurst
+import TimerDialog
 import TimerUtils
 import Real
 import Wurstunit
@@ -26,6 +27,23 @@ public function timer.doAfter(real timeToWait, CallbackSingle cb) returns Callba
 public function doAfter(real timeToWait, CallbackSingle cb) returns CallbackSingle
 	return getTimer().doAfter(timeToWait, cb)
 
+/** Execute an action after a certain time.
+	The timer is accompanied by a visible timerdialog with the title text provided.
+	The callback object is automatically destroyed.
+
+	Example use:
+	| doAfterWithDialogue(10.0, "Respawn in") ->
+	|	 hero.revive()
+	|	 print("10 seconds later")
+*/
+public function doAfterWithDialogue(real timeToWait, string titleText, Callback cb) returns CallbackSingle
+	let tim = getTimer()
+	let dia = tim.createTimerDialog()..setTitle(titleText)..display(true)
+	return tim.doAfter(timeToWait) ->
+		cb.call()
+		destroy cb
+		dia.destr()
+
 /** Execute an action with a 0-second timer delay.
 	The callback object is destroyed afterwards.
 */
@@ -104,6 +122,9 @@ public function doPeriodicallyTimed(real interval, real timerDuration, CallbackC
 	return getTimer().doPeriodicallyTimed(interval, timerDuration, cb)
 
 //Timer Stuff
+public interface Callback
+	function call()
+
 public abstract class CallbackSingle
 	private timer t
 	abstract function call()

wurst/data/LinkedList.wurst

@@ -88,6 +88,10 @@ public class LinkedList<T>
 	function getFirst() returns T
 		return dummy.next.elem
 
+	/** Returns the last element in the list */
+	function getLast() returns T
+		return dummy.prev.elem
+
 	/** Returns and removes the first added Element (FIFO) */
 	function dequeue() returns T
 		let top = dummy.next
@@ -108,7 +112,7 @@ public class LinkedList<T>
 
 	/** Returns the lastly added Element */
 	function peek() returns T
-		return dummy.prev.elem
+		return getLast()
 
 	/** Returns whether the lists contains the specified element */
 	@deprecated("Use .has instead") function contains(T elem) returns boolean
@@ -175,7 +179,7 @@ public class LinkedList<T>
 	/** get the static back iterator for this list */
 	function staticBackItr() returns LLBackIterator<T>
 		if staticBackItr == null
-			staticBackItr = new LLBackIterator<T>(dummy, false)
+			staticBackItr = new LLBackIterator<T>(this, false)
 		staticBackItr.reset()
 		return staticBackItr
 
@@ -185,11 +189,11 @@ public class LinkedList<T>
 
 	/** get a backiterator for this list */
 	function backiterator() returns LLBackIterator<T>
-		return new LLBackIterator(dummy)
+		return new LLBackIterator(this)
 
 	/** adds an element to the beginning of the list */
 	function enqueue(T elem)
-		addtoStart(elem)
+		add(elem)
 
 	/** adds an element to the beginning of the list */
 	function addtoStart(T elem)
@@ -491,6 +495,9 @@ public class LLIterator<T>
 			retVal = current.next.elem
 		return retVal
 
+	function previous() returns T
+		return current.prev.elem
+
 	/** Adds an element before the currently iterated element */
 	function addBefore(T elem)
 		let entry = new LLEntry<T>(elem, current.prev, current)
@@ -505,18 +512,20 @@ public class LLIterator<T>
 public class LLBackIterator<T>
 	LLEntry<T> dummy
 	LLEntry<T> current
+	LinkedList<T> parent
 	protected bool destroyOnClose = true
 
-	construct(LLEntry<T> dummy, bool destroyOnClose)
-		this.dummy = dummy
+	construct(LinkedList<T> parent, bool destroyOnClose)
+		this.parent = parent
 		reset()
 		this.destroyOnClose = destroyOnClose
 
-	construct(LLEntry<T> dummy)
-		this.dummy = dummy
+	construct(LinkedList<T> parent)
+		this.parent = parent
 		reset()
 
 	function reset()
+		this.dummy = parent.getDummy()
 		this.current = dummy
 
 	/** Modifies the last element that was returned by next() (optional operation). */
@@ -537,6 +546,13 @@ public class LLBackIterator<T>
 			retVal = current.prev.elem
 		return retVal
 
+	/** Adds an element before the currently iterated element */
+	function addBefore(T elem)
+		let entry = new LLEntry<T>(elem, current.prev, current)
+		current.prev.next = entry
+		current.prev = entry
+		parent.size++
+
 	function close()
 		if destroyOnClose
 			destroy this
@@ -567,6 +583,10 @@ constant Comparator<int> intComparator = (i1, i2) -> i1 - i2
 public function LinkedList<int>.sort()
 	this.sortWith(intComparator)
 
+constant Comparator<string> stringComparator = (s1, s2) -> stringCompare(s1, s2)
+public function LinkedList<string>.sort()
+	this.sortWith(stringComparator)
+
 public function group.asList() returns LinkedList<unit>
 	let result = new LinkedList<unit>()
 	this.forEachFrom() u ->
@@ -607,4 +627,4 @@ public function LinkedList<string>.join() returns string
 	return this.joinBy("")
 
 init
-	realToIndex(0.)
+	realToIndex(0.)

wurst/dummy/DummyCaster.wurst

@@ -16,7 +16,8 @@ import ClosureTimers
  * DummyCaster uses one dummy per cast, and only removes it after a set delay, to allow effects and damage to process
  * Example with long delay for blizzard:
  *
- *		new DummyCaster(casterPos)
+ *		new DummyCaster()
+ *			..origin(casterPos)
  *			..owner(caster)
  *			..delay(15)
  *			..castPoint('A000', 1, OrderIds.OrderIds.blizzard, target)
@@ -29,11 +30,16 @@ public class DummyCaster
 	private var castCount = 0
 	protected var delay = 5.0
 	protected var owner = DUMMY_PLAYER
-	protected var origin = ZERO2
+	protected var origin = ZERO3
 
 	construct()
 
+	/** Sets the origin of the dummy with a z-value of 0 */
 	function origin(vec2 pos)
+		this.origin = pos.toVec3()
+
+	/** Sets the origin of the dummy */
+	function origin(vec3 pos)
 		this.origin = pos
 
 	/** Sets the owner of the dummy */
@@ -75,9 +81,9 @@ public class DummyCaster
 		return dummy
 
 	protected function prepare(int id, int lvl) returns unit
-		let dummy = DummyRecycler.get(origin, angle(0))
+		let dummy = DummyRecycler.get(origin.toVec2(), angle(0))
 		if origin.inBounds()
-			dummy.setXY(origin)
+			dummy.setXYZ(origin)
 		dummy..addAbility(id)..setMana(1000000)
 		if lvl > 1
 			dummy.setAbilityLevel(id, lvl)

wurst/dummy/DummyDamage.wurst

@@ -20,7 +20,7 @@ import DummyRecycler
 */
 
 public class DummyDamage
-	private unit dummy = DummyRecycler.get(origin, angle(0))
+	private unit dummy = null
 	private widget target = null
 	private var amount = 0.
 	private var attack = false
@@ -35,6 +35,9 @@ public class DummyDamage
 		apply(false)
 
 	function apply(boolean terminate)
+		if dummy == null
+			dummy = DummyRecycler.get(origin, angle(0))
+		dummy.setPos(origin)
 		dummy
 		..setOwner(attacker, false)
 		..damageTarget(target, amount, attack, ranged, attackType, damageType, weaponType)
@@ -70,4 +73,5 @@ public class DummyDamage
 		this.weaponType = weaponType
 
 	ondestroy
-		DummyRecycler.recycle(dummy)
+		if dummy != null
+			DummyRecycler.recycle(dummy)

wurst/file/ChunkedString.wurst

@@ -97,7 +97,7 @@ public class ChunkedString
 		let lastChunk = endIndex div chunkSize
 		for i = startChunk to lastChunk
 			if i == startChunk
-				out += getChunk(i).substring(startIndex - startChunk * chunkSize, min(endIndex, chunkSize))
+				out += getChunk(i).substring(startIndex - startChunk * chunkSize, min(endIndex - startChunk * chunkSize, chunkSize))
 			else if i == lastChunk
 				out += getChunk(i).substring(0, endIndex - lastChunk * chunkSize)
 			else
@@ -125,4 +125,4 @@ function chunkedStringTest()
 	cstring.getUnsafeString().assertEquals("abcdefghijklmnopq")
 	cstring.getUnsafeSubString(4, 12).assertEquals("efghijkl")
 	cstring.getUnsafeSubString(0, 3).assertEquals("abc")
-	cstring.getUnsafeSubString(15, 17).assertEquals("pq")
+	cstring.getUnsafeSubString(15, 17).assertEquals("pq")