Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Battalion: Move crate pickup animation to crate
authorWuzzy <Wuzzy2@mail.ru>
Mon, 12 Feb 2018 17:47:40 +0100
changeset 12983 7c3454083489
parent 12982 ba577e0b8c27
child 12984 353603f5cec3
Battalion: Move crate pickup animation to crate
share/hedgewars/Data/Scripts/Multiplayer/Battalion.lua file | annotate | diff | comparison | revisions 
--- a/share/hedgewars/Data/Scripts/Multiplayer/Battalion.lua	Mon Feb 12 17:22:29 2018 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Battalion.lua	Mon Feb 12 17:47:40 2018 +0100
@@ -804,7 +804,7 @@
  :
  : Has a 7% chance to be empty.
 ]]--
-function onWeaponCratePickup()
+function onWeaponCratePickup(crate)
   local factor = 1 * strength
   local msgColor = GetClanColor(GetHogClan(CurHog))
   PlaySound(sndShotgunReload)
@@ -841,7 +841,7 @@
   AddAmmo(CurHog, randAmmo, GetAmmoCount(CurHog, randAmmo) +factor)
   if IsHogLocal(CurHog) then
     AddCaption(string.format(loc("%s (+%d)"), GetAmmoName(randAmmo), factor), msgColor, capgrpMessage)
-    local effect = AddVisualGear(GetX(CurHog), GetY(CurHog) +cratePickupGap, vgtAmmo, 0, true)
+    local effect = AddVisualGear(GetX(crate), GetY(crate) +cratePickupGap, vgtAmmo, 0, true)
     SetVisualGearValues(effect, nil, nil, nil, nil, nil, randAmmo, nil, nil, nil, msgColor)
   end
 end
@@ -850,7 +850,7 @@
  :
  : Has a 7% chance to be empty.
 ]]--
-function onUtilityCratePickup()
+function onUtilityCratePickup(crate)
   local factor = 1 * strength
   local msgColor = GetClanColor(GetHogClan(CurHog))
   PlaySound(sndShotgunReload)
@@ -884,7 +884,7 @@
   AddAmmo(CurHog, randUtility, GetAmmoCount(CurHog, randUtility) +factor)
   if IsHogLocal(CurHog) then
     AddCaption(string.format(loc("%s (+%d)"), GetAmmoName(randUtility), factor), msgColor, capgrpMessage)
-    local effect = AddVisualGear(GetX(CurHog), GetY(CurHog) +cratePickupGap, vgtAmmo, 0, true)
+    local effect = AddVisualGear(GetX(crate), GetY(crate) +cratePickupGap, vgtAmmo, 0, true)
     SetVisualGearValues(effect, nil, nil, nil, nil, nil, randUtility, nil, nil, nil, msgColor)
   end
 end
@@ -895,11 +895,11 @@
   -- Check if the crate is fake
   if pos % posCaseDummy >= 1 then
     if pos % posCaseDummy == posCaseAmmo then
-      onWeaponCratePickup()
+      onWeaponCratePickup(crate)
     elseif pos % posCaseDummy == posCaseHealth then
       onHealthCratePickup()
     elseif pos % posCaseDummy == posCaseUtility then
-      onUtilityCratePickup()
+      onUtilityCratePickup(crate)
     end
   end
 end
hedgewars