Overwrite GitHub repo with updated local files

Author: Spellbound7

ExampleMap - Copy.w3x

@@ -2,7 +2,3 @@
 projectName: TransportNetwork
 dependencies:
 - https://github.com/wurstscript/wurstStdlib2
-buildMapData:
-  name: MyMapName
-  fileName: MyMapFile
-  author: Spellbound

ExampleMap.w3x

@@ -19,40 +19,43 @@ public class Book
     Page lastPage
 
     construct(int pageSize)
-        pages = new HashMap<int, Page>
-        maxItemsPerPage = pageSize
-        numberOfPages = 0
-        firstPage = null
-        lastPage = null
-        new Page(this)
+        this.pages = new HashMap<int, Page>
+        this.maxItemsPerPage = pageSize
+        this.numberOfPages = 0
+        this.firstPage = null
+        this.lastPage = null
 
     ondestroy
         destroy pages
 
     function addPage(Page page)
-        numberOfPages++
-        page.number = numberOfPages
-        pages.put(numberOfPages, page)
-        firstPage = pages.get(1)
-        lastPage = pages.get(numberOfPages)
+        this.numberOfPages++
+        page.number = this.numberOfPages
+        this.pages.put(this.numberOfPages, page)
+        this.firstPage = this.pages.get(1)
+        this.lastPage = this.pages.get(this.numberOfPages)
 
     /** this will not automatically refactor the list to remove blank spaces. Only remove last pages.*/
     function removePage(Page page)
-        pages.remove(page.number)
-        numberOfPages--
-        lastPage = pages.get(numberOfPages)
+        this.pages.remove(page.number)
+        this.numberOfPages--
+        if this.numberOfPages < 1
+            this.firstPage = null
+            this.lastPage = null
+        else
+            this.lastPage = this.pages.get(this.numberOfPages)
 
     function getPage(int pageNumber) returns Page
-        return pages.get(pageNumber)
+        return this.pages.get(pageNumber)
 
-    function addUnitUI(UnitUI ui)
-        lastPage.addItem(ui)
+    function addPassenger(Passenger passenger)
+        this.lastPage.addItem(passenger)
 
-    function removeUnitUI(UnitUI ui) returns int
-        return ui.page.removeItem(ui)
+    function removePassenger(Passenger passenger) returns int
+        return passenger.page.removeItem(passenger)
 
     function isEmpty() returns bool
-        if pages.get(1) == null
+        if this.pages.get(1) == null
             return true
         return false
 
@@ -61,52 +64,52 @@ public class Page
     int number
     int maxSize
     Book book
-    LinkedList<UnitUI> items
+    LinkedList<Passenger> items
 
     construct(Book whichBook)
-        items = new LinkedList<UnitUI>
-        number = 0
-        maxSize = whichBook.maxItemsPerPage
-        book = whichBook
+        this.items = new LinkedList<Passenger>
+        this.number = 0
+        this.maxSize = whichBook.maxItemsPerPage
+        this.book = whichBook
         whichBook.addPage(this)
 
     ondestroy
-        destroy items
+        destroy this.items
 
     /** if this current Page has reached its limit, a new page with a page number + 1 will be created, added to the same book, and returned.*/
-    function addItem(UnitUI ui) returns thistype
-        if items.size() < maxSize
-            items.push(ui)
-            ui.page = this
+    function addItem(Passenger passenger) returns thistype
+        if this.items.size() < this.maxSize
+            this.items.push(passenger)
+            passenger.page = this
         else
-            let newPage = new Page(book)
-            newPage.items.push(ui)
-            ui.page = newPage
+            let newPage = new Page(this.book)
+            newPage.items.push(passenger)
+            passenger.page = newPage
             return newPage
         return this
 
-    static function getNumFromItem(UnitUI ui) returns int
-        return ui.page.number
+    static function getNumFromItem(Passenger passenger) returns int
+        return passenger.page.number
 
     /** removes a frame from a Page and returns the number of that Page or the one before it if the Page becomes empty from that action. */
-    function removeItem(UnitUI ui) returns int
-        items.remove(ui)
-        ui.page = null
-        if items.isEmpty()
-            let num = number - 1
-            book.removePage(this)
+    function removeItem(Passenger passenger) returns int
+        this.items.remove(passenger)
+        passenger.page = null
+        if this.items.isEmpty()
+            let num = this.number - 1
+            this.book.removePage(this)
             destroy this
             return num
         else
-            for pgNum = number to book.numberOfPages
-                let currentPage = book.pages.get(pgNum)
-                let nextPage = book.pages.get(pgNum + 1)
+            for pgNum = this.number to this.book.numberOfPages
+                let currentPage = this.book.pages.get(pgNum)
+                let nextPage = this.book.pages.get(pgNum + 1)
                 if nextPage != null
                     while currentPage.items.size() < currentPage.maxSize and not nextPage.items.isEmpty()
-                        let ico = nextPage.items.dequeue()
-                        currentPage.items.push(ico)
-                        ico.page = currentPage
+                        let pass = nextPage.items.dequeue()
+                        currentPage.items.push(pass)
+                        pass.page = currentPage
                     if nextPage.items.isEmpty()
                         nextPage.book.removePage(nextPage)
                         destroy nextPage
-            return number
+            return this.number

imports/ReplaceableTextures/Weather/SBL_SpiritTargetingLaser.blp

@@ -4,8 +4,8 @@ import TransportNetwork
 import UnitIndexer
 import Assets
 
-constant LOAD_TIME = 1.
-constant UNLOAD_TIME = 1.
+constant LOAD_TIME = .5
+constant UNLOAD_TIME = .5
 constant LOAD_RANGE = 160.
 
 
@@ -95,5 +95,6 @@ init
 
     EventListener.add(EVENT_PLAYER_UNIT_DEATH) ->
         let u = EventData.getTriggerUnit()
-        destroy networkHash.get(u)
-        networkHash.remove(u)
+        if networkHash.has(u)
+            destroy networkHash.get(u)
+            networkHash.remove(u)

imports/ReplaceableTextures/Weather/SBL_WhiteTargetingLaser.blp

@@ -35,58 +35,60 @@ public class HealthBar
     private static let barList = new LinkedList<thistype>
 
     framehandle hpBar
-    unit source
+    LinkedList<unit> assignments = new LinkedList<unit>
     bool isListed // prevents from having to search through a list all the time
-    player owner
 
-    construct(framehandle parentFrame, unit u, player play, real height, real width)
+    construct(framehandle parentFrame, real height, real width)
         hpBar = createSimpleFrame("MySimpleBar", parentFrame, 0)
         ..setTexture(Textures.human_statbar_color3, 0, false)
         ..setSize(width, height)
         ..setPoint(FRAMEPOINT_TOPLEFT, parentFrame, FRAMEPOINT_BOTTOMLEFT)
         ..hide()
-        source = u
-        owner = play
-        isListed = false
+        this.isListed = false
 
+    // this shouldn't be used at all tbh
     ondestroy
-        unlist()
-        hpBar.remove()
-        source = null
+        // hpBar.remove() // destroying framehandles can desync the game
+        this.hpBar.hide()
+        this.hpBar = null
 
     function update()
-        let percentage = source.getHP() / source.getMaxHP()
-        int red
-        int blue
-        int green
-        if percentage > .5
-            let newPer = (percentage-.5)/.5
-            red = ((HIGH_PEAK_RED * newPer) + HALF_RED).toInt()
-            green = ((HIGH_PEAK_GREEN * newPer) + HALF_GREEN).toInt()
-            blue = ((HIGH_PEAK_BLUE * newPer) + HALF_BLUE).toInt()
-        else
-            let newPer = percentage/.5
-            red = ((LOW_PEAK_RED * newPer) + EMPTY_RED).toInt()
-            green = ((LOW_PEAK_GREEN * newPer) + EMPTY_GREEN).toInt()
-            blue = ((LOW_PEAK_BLUE * newPer) + EMPTY_BLUE).toInt()
-        let barCol = color(red, green, blue)
-        hpBar.setVertexColor(BlzConvertColor(255, barCol.red, barCol.green, barCol.blue))
-        hpBar.setValue(percentage * 100.)
-
-    function unlist()
+        for u in this.assignments
+            let percentage = u.getHP() / u.getMaxHP()
+            int red
+            int blue
+            int green
+            if percentage > .5
+                let newPer = (percentage-.5)/.5
+                red = ((HIGH_PEAK_RED * newPer) + HALF_RED).toInt()
+                green = ((HIGH_PEAK_GREEN * newPer) + HALF_GREEN).toInt()
+                blue = ((HIGH_PEAK_BLUE * newPer) + HALF_BLUE).toInt()
+            else
+                let newPer = percentage/.5
+                red = ((LOW_PEAK_RED * newPer) + EMPTY_RED).toInt()
+                green = ((LOW_PEAK_GREEN * newPer) + EMPTY_GREEN).toInt()
+                blue = ((LOW_PEAK_BLUE * newPer) + EMPTY_BLUE).toInt()
+            let barCol = color(red, green, blue)
+            if localPlayer == u.getOwner()
+                this.hpBar.setVertexColor(BlzConvertColor(255, barCol.red, barCol.green, barCol.blue))
+                this.hpBar.setValue(percentage * 100.)
+
+    function unassign(unit u)
+        this.assignments.remove(u)
+        this.hpBar.hide(u.getOwner())
         if isListed
             barList.remove(this)
-            isListed = false
-            hpBar.hide()
+            this.isListed = false
             if barList.isEmpty()
                 clock.release()
 
-    function list()
+    function assign(unit u)
+        this.assignments.push(u)
+        this.hpBar.show(u.getOwner())
+        this.update()
         if not isListed
             barList.push(this)
-            isListed = true
-            hpBar.show(owner)
-            update()
+            this.isListed = true
             if barList.size() == 1
                 clock = getTimer()
                 clock.startPeriodic(INTERVAL, function callback)

imports/Splats/LightningData.slk

@@ -5,12 +5,12 @@ import ClosureEvents
 public real array mouseX
 public real array mouseY
 public vec2 array mousePos
-//public unit array mouseFocusUnit
+// public unit array mouseFocusUnit
 
 init
     EventListener.add(EVENT_PLAYER_MOUSE_MOVE) ->
         let id = EventData.getTriggerPlayer().getId()
         mouseX[id] = BlzGetTriggerPlayerMouseX()
         mouseY[id] = BlzGetTriggerPlayerMouseY()
         mousePos[id] = vec2(mouseX[id], mouseY[id])
-        //mouseFocusUnit[id] = BlzGetMouseFocusUnit()
+        // mouseFocusUnit[id] = BlzGetMouseFocusUnit()