Fix multiple small bugs! (#90)

matanlurey · web-flow · commit 7779c4a54bed · 2019-10-09T09:49:28.000-07:00
* Fix multiple small bugs.

* Restore thumbnail.
diff --git a/mod/StarWarsLegion.json b/mod/StarWarsLegion.json
diff --git a/mod/src/blocksquare.99f1c8.lua b/mod/src/blocksquare.99f1c8.lua
@@ -89,7 +89,9 @@ function dropCoroutine()
     while self.getVelocity().y != 0 do
         coroutine.yield(0)
     end
-    spawnCohesionRuler()
+    if moveState == true then
+        spawnCohesionRuler()
+    end
     return 1
 end
 
diff --git a/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87.lua b/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87/~state.2.7970ad.lua b/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87/~state.2.7970ad.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87/~state.3.6d7d77.lua b/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87/~state.3.6d7d77.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87/~state.4.e7d4e1.lua b/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87/~state.4.e7d4e1.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87/~state.5.2f908d.lua b/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87/~state.5.2f908d.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87/~state.6.ca106f.lua b/mod/src/condition_tokens.4d25eb/condition_token_[1].85fa87/~state.6.ca106f.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/conditions.1c7fbf/minefield.a4b6ac/mine_condition_token.318653.lua b/mod/src/conditions.1c7fbf/minefield.a4b6ac/mine_condition_token.318653.lua
@@ -15,6 +15,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/conditions.1c7fbf/minefield.a4b6ac/mine_condition_token.c9ac5c.lua b/mod/src/conditions.1c7fbf/minefield.a4b6ac/mine_condition_token.c9ac5c.lua
@@ -15,6 +15,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/conditions.1c7fbf/minefield.a4b6ac/mine_condition_token.de821c.lua b/mod/src/conditions.1c7fbf/minefield.a4b6ac/mine_condition_token.de821c.lua
@@ -15,6 +15,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/learning_game.272d58/blue_at-rt.1c8080.lua b/mod/src/learning_game.272d58/blue_at-rt.1c8080.lua
@@ -94,7 +94,9 @@ function dropCoroutine()
     while self.getVelocity().y != 0 do
         coroutine.yield(0)
     end
-    spawnCohesionRuler()
+    if moveState == true then
+        spawnCohesionRuler()
+    end
     return 1
 end
 
diff --git a/mod/src/learning_game.272d58/blue_luke_skywalker.a26273.lua b/mod/src/learning_game.272d58/blue_luke_skywalker.a26273.lua
@@ -94,7 +94,9 @@ function dropCoroutine()
     while self.getVelocity().y != 0 do
         coroutine.yield(0)
     end
-    spawnCohesionRuler()
+    if moveState == true then
+        spawnCohesionRuler()
+    end
     return 1
 end
 
diff --git a/mod/src/learning_game.272d58/blue_rebel_trooper_leader.4a7fa1.lua b/mod/src/learning_game.272d58/blue_rebel_trooper_leader.4a7fa1.lua
@@ -98,7 +98,9 @@ function dropCoroutine()
     while self.getVelocity().y != 0 do
         coroutine.yield(0)
     end
-    spawnCohesionRuler()
+    if moveState == true then
+        spawnCohesionRuler()
+    end
     return 1
 end
 
diff --git a/mod/src/learning_game.272d58/red_74-z_speeder_bike_leader.59260a.lua b/mod/src/learning_game.272d58/red_74-z_speeder_bike_leader.59260a.lua
@@ -95,7 +95,9 @@ function dropCoroutine()
     while self.getVelocity().y != 0 do
         coroutine.yield(0)
     end
-    spawnCohesionRuler()
+    if moveState == true then
+        spawnCohesionRuler()
+    end
     return 1
 end
 
diff --git a/mod/src/learning_game.272d58/red_darth_vader.b9f54c.lua b/mod/src/learning_game.272d58/red_darth_vader.b9f54c.lua
@@ -94,7 +94,9 @@ function dropCoroutine()
     while self.getVelocity().y != 0 do
         coroutine.yield(0)
     end
-    spawnCohesionRuler()
+    if moveState == true then
+        spawnCohesionRuler()
+    end
     return 1
 end
 
diff --git a/mod/src/learning_game.272d58/red_stormtrooper_leader.3e2253.lua b/mod/src/learning_game.272d58/red_stormtrooper_leader.3e2253.lua
@@ -98,7 +98,9 @@ function dropCoroutine()
     while self.getVelocity().y != 0 do
         coroutine.yield(0)
     end
-    spawnCohesionRuler()
+    if moveState == true then
+        spawnCohesionRuler()
+    end
     return 1
 end
 
diff --git a/mod/src/learning_game.272d58/red_stormtrooper_leader.85d5a9.lua b/mod/src/learning_game.272d58/red_stormtrooper_leader.85d5a9.lua
@@ -98,7 +98,9 @@ function dropCoroutine()
     while self.getVelocity().y != 0 do
         coroutine.yield(0)
     end
-    spawnCohesionRuler()
+    if moveState == true then
+        spawnCohesionRuler()
+    end
     return 1
 end
 
diff --git a/mod/src/objective_token.094239/objective_token.761482.lua b/mod/src/objective_token.094239/objective_token.761482.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/objective_token.094239/objective_token.761482/~state.2.f6bc3c.lua b/mod/src/objective_token.094239/objective_token.761482/~state.2.f6bc3c.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/objective_token.094239/objective_token.761482/~state.3.e1a556.lua b/mod/src/objective_token.094239/objective_token.761482/~state.3.e1a556.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/objective_token.094239/objective_token.761482/~state.4.c9df63.lua b/mod/src/objective_token.094239/objective_token.761482/~state.4.c9df63.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/objective_token.094239/objective_token.761482/~state.5.01e439.lua b/mod/src/objective_token.094239/objective_token.761482/~state.5.01e439.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/objectives.3d15a5/intercept_the_transmissions.89eb66/objective_token.211e07.lua b/mod/src/objectives.3d15a5/intercept_the_transmissions.89eb66/objective_token.211e07.lua
@@ -16,6 +16,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/objectives.3d15a5/intercept_the_transmissions.89eb66/objective_token.344106.lua b/mod/src/objectives.3d15a5/intercept_the_transmissions.89eb66/objective_token.344106.lua
@@ -17,6 +17,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/objectives.3d15a5/intercept_the_transmissions.89eb66/objective_token.b20553.lua b/mod/src/objectives.3d15a5/intercept_the_transmissions.89eb66/objective_token.b20553.lua
@@ -17,6 +17,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/proton_charge_tokens.603bb2/proton_charge_token.d616e2.lua b/mod/src/proton_charge_tokens.603bb2/proton_charge_token.d616e2.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/return_tokens.3a5f7f.lua b/mod/src/return_tokens.3a5f7f.lua
@@ -7,6 +7,7 @@ function onLoad(save_state)
     dodgeBag = getObjectFromGUID(Global.getVar("dodgeBagGUID"))
     standbyBag = getObjectFromGUID(Global.getVar("standbyBagGUID"))
     surgeBag = getObjectFromGUID(Global.getVar("surgeBagGUID"))
+    smokeBag = getObjectFromGUID(Global.getVar("smokeBagGUID"))
     ionBag = getObjectFromGUID(Global.getVar("ionBagGUID"))
     suppressionBag = getObjectFromGUID(Global.getVar("suppressionBagGUID"))
     unitInfo = Global.getTable("unitInfo")
@@ -28,11 +29,12 @@ function returnTokens()
     assetButton.AssetBundle.playTriggerEffect(0)
 
 
-    local allObjects = nil
     local allObjects = battlefieldZone.getObjects()
     local aimNumber = 1
     local dodgeNumber = 1
     local standbyNumber = 1
+    local surgeNumber = 1
+    local smokeNumber = 1
     local commandNumber = 1
 
 
@@ -43,9 +45,11 @@ function returnTokens()
             elseif obj.getName() == "Dodge Token" then
                 dodgeNumber = returnToken(dodgeBag,obj,dodgeNumber)
             elseif obj.getName() == "Standby Token" then
-                dodgeNumber = returnToken(standbyBag,obj,standbyNumber)
+                standbyNumber = returnToken(standbyBag,obj,standbyNumber)
             elseif obj.getName() == "Surge Token" then
-                dodgeNumber = returnToken(surgeBag,obj,standbyNumber)
+                surgeNumber = returnToken(surgeBag,obj,surgeNumber)
+            elseif obj.getName() == "Smoke Token" then
+                smokeNumber = returnToken(smokeBag,obj,smokeNumber)
 
             elseif obj.getVar("isAToken") == true then
 
diff --git a/mod/src/smoke_tokens.d03507/smoke_token.63cabc.lua b/mod/src/smoke_tokens.d03507/smoke_token.63cabc.lua
@@ -12,6 +12,10 @@ function onLoad(save_state)
     })
 end
 
+function onDestroy()
+    clearRangeRuler()
+end
+
 function toggleRangeRuler()
     if rangeOn then
         clearRangeRuler()
diff --git a/mod/src/~global.lua b/mod/src/~global.lua
@@ -176,6 +176,7 @@ function onLoad()
     standbyBagGUID = "f103c2"
     surgeBagGUID = "f539b0"
     suppressionBagGUID = "a25e12"
+    smokeBagGUID = "d03507"
     ionBagGUID = "799a75"
     woundBagGUID = "276535"
 
@@ -328,7 +329,7 @@ function onLoad()
     unitInfo.chewbacca.buttonHeight = 2
 
     unitInfo.c3po = {}
-    unitInfo.c3po.commandType = "rebelOperative"
+    unitInfo.c3po.commandType = nil
     unitInfo.c3po.baseSize = "small"
     unitInfo.c3po.fixedMove = false
     unitInfo.c3po.selectedSpeed = 1
@@ -343,11 +344,11 @@ function onLoad()
     unitInfo.r2d2.fixedMove = false
     unitInfo.r2d2.selectedSpeed = 1
     unitInfo.r2d2.fixedArc = false
-    unitInfo.r2d2.squadStatus = false
+    unitInfo.r2d2.squadStatus = true
     unitInfo.r2d2.buttonHeight = 2
 
     unitInfo.republicC3po = {}
-    unitInfo.republicC3po.commandType = "republicOperative"
+    unitInfo.republicC3po.commandType = nil
     unitInfo.republicC3po.baseSize = "small"
     unitInfo.republicC3po.fixedMove = false
     unitInfo.republicC3po.selectedSpeed = 1
@@ -362,7 +363,7 @@ function onLoad()
     unitInfo.republicR2d2.fixedMove = false
     unitInfo.republicR2d2.selectedSpeed = 1
     unitInfo.republicR2d2.fixedArc = false
-    unitInfo.republicR2d2.squadStatus = false
+    unitInfo.republicR2d2.squadStatus = true
     unitInfo.republicR2d2.buttonHeight = 2
 
     unitInfo.sabineWren = {}
@@ -3216,9 +3217,9 @@ function onLoad()
         availableUpgrades = {
         },
         miniInfo = {miniInfo.c3po},
-        tokenName = "Republic Operative Command Token",
+        tokenName = "",
         fullName = "C-3PO",
-        rank = "Operative",
+        rank = "Counterpart",
         noToken = true
     }
     cardInfo.unitCards.phaseICloneTroopers = {
@@ -3419,9 +3420,9 @@ function onLoad()
         availableUpgrades = {
         },
         miniInfo = {miniInfo.c3po},
-        tokenName = "Rebel Operative Command Token",
+        tokenName = "",
         fullName = "C-3PO",
-        rank = "Operative",
+        rank = "Counterpart",
         noToken = true
     }
     cardInfo.unitCards.rebelTrooper = {
