# HG changeset patch # User sheepluva # Date 1315576379 -7200 # Node ID a416f1070fdf628e2f872f8ac43f67cfd6869b04 # Parent a6eab1b7c00d947ca939dbad0443b58c11af37e2 we don't need trailing whitespaces... I guess :P diff -r a6eab1b7c00d -r a416f1070fdf share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua Fri Sep 09 15:36:30 2011 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua Fri Sep 09 15:52:59 2011 +0200 @@ -18,16 +18,16 @@ function randomAmmo() local n = 3 --"points" to be allocated on weapons - + --pick random weapon and subtract cost local r = GetRandom(table.maxn(weapons_values)) + 1 local picked_items = {} table.insert(picked_items, weapons[r]) n = n - weapons_values[r] - - + + --choose any weapons or utilities to use up remaining n - + while n > 0 do local items = {} local items_values = {} @@ -63,12 +63,12 @@ end end end - + local r = GetRandom(table.maxn(items_values)) + 1 table.insert(picked_items, items[r]) n = n - items_values[r] end - + return picked_items end @@ -111,7 +111,7 @@ function onAmmoStoreInit() SetAmmo(amSkip, 9, 0, 0, 0) - + SetAmmo(amExtraDamage, 0, 1, 0, 1) SetAmmo(amInvulnerable, 0, 1, 0, 1) SetAmmo(amExtraTime, 0, 1, 0, 1) diff -r a6eab1b7c00d -r a416f1070fdf share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua Fri Sep 09 15:36:30 2011 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua Fri Sep 09 15:52:59 2011 +0200 @@ -84,7 +84,7 @@ ------------------ "Oh well, they probably have the memory" local gameStarted = false -local gameTurns = 0 +local gameTurns = 0 -------------------------- -- hog and team tracking variales @@ -142,14 +142,14 @@ if fCaptures[teamID] == 3 then for i = 0, (numhhs-1) do - if hhs[i] ~= nil then + if hhs[i] ~= nil then if GetHogClan(hhs[i]) == alt then SetEffect(hhs[i], heResurrectable, false) SetHealth(hhs[i],0) end end end - if CurrentHedgehog ~= nil then + if CurrentHedgehog ~= nil then ShowMission(loc("GAME OVER!"), loc("Victory for the ") .. GetHogTeamName(CurrentHedgehog), loc("Hooray!"), 0, 0) end end @@ -165,18 +165,18 @@ wtf = 1 bbq = 0 end - + -- player has successfully captured the enemy flag if (GetHogClan(CurrentHedgehog) == wtf) and (CurrentHedgehog == fThief[bbq]) and (fIsMissing[wtf] == false) then - + DeleteVisualGear(fGear[wtf]) - fGear[wtf] = nil -- the flag has now disappeared - + fGear[wtf] = nil -- the flag has now disappeared + fIsMissing[wtf] = false fNeedsRespawn[wtf] = true fIsMissing[bbq] = false fNeedsRespawn[bbq] = true - fCaptures[wtf] = fCaptures[wtf] +1 + fCaptures[wtf] = fCaptures[wtf] +1 ShowMission(loc("You have SCORED!!"), GetHogTeamName(CurrentHedgehog) .. ": " .. fCaptures[wtf], loc("Opposing Team: ") .. fCaptures[bbq], 0, 0) PlaySound(sndVictory) fThief[bbq] = nil -- player no longer has the enemy flag @@ -184,23 +184,23 @@ --if the player is returning the flag elseif (GetHogClan(CurrentHedgehog) == wtf) and (fIsMissing[wtf] == true) then - + DeleteVisualGear(fGear[wtf]) fGear[wtf] = nil -- the flag has now disappeared - - fNeedsRespawn[wtf] = true + + fNeedsRespawn[wtf] = true HandleRespawns() -- this will set fIsMissing[wtf] to false :) AddCaption(loc("Flag returned!")) - + --if the player is taking the enemy flag elseif GetHogClan(CurrentHedgehog) == bbq then - + DeleteVisualGear(fGear[wtf]) - fGear[wtf] = nil -- the flag has now disappeared - + fGear[wtf] = nil -- the flag has now disappeared + fIsMissing[wtf] = true for i = 0,numhhs-1 do - if CurrentHedgehog ~= nil then + if CurrentHedgehog ~= nil then if CurrentHedgehog == hhs[i] then fThief[wtf] = hhs[i] end @@ -209,23 +209,23 @@ AddCaption(loc("Flag captured!")) end - + end -function CheckFlagProximity() +function CheckFlagProximity() for i = 0, 1 do if fGear[i] ~= nil then - + g1X = fGearX[i] - g1Y = fGearY[i] - + g1Y = fGearY[i] + g2X, g2Y = GetGearPosition(CurrentHedgehog) q = g1X - g2X w = g1Y - g2Y dist = (q*q) + (w*w) - + if dist < 500 then --1600 DoFlagStuff(fGear[i]) end @@ -242,7 +242,7 @@ if fNeedsRespawn[i] == true then fGear[i] = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true) fGearX[i] = fSpawnX[i] - fGearY[i] = fSpawnY[i] + fGearY[i] = fSpawnY[i] fNeedsRespawn[i] = false fIsMissing[i] = false -- new, this should solve problems of a respawned flag being "returned" when a player tries to score @@ -265,16 +265,16 @@ end if fThief[wtf] ~= nil then - -- falls into water - --ShowMission(LAND_HEIGHT, fThiefY[wtf], (LAND_HEIGHT - fThiefY[wtf]), 0, 0) + -- falls into water + --ShowMission(LAND_HEIGHT, fThiefY[wtf], (LAND_HEIGHT - fThiefY[wtf]), 0, 0) if (LAND_HEIGHT - fThiefY[wtf]) < 15 then fIsMissing[wtf] = true fNeedsRespawn[wtf] = true HandleRespawns() - else --normally + else --normally fGearX[wtf] = fThiefX[wtf] - fGearY[wtf] = fThiefY[wtf] - fGear[wtf] = AddVisualGear(fGearX[wtf],fGearY[wtf],vgtCircle,0,true) + fGearY[wtf] = fThiefY[wtf] + fGear[wtf] = AddVisualGear(fGearX[wtf],fGearY[wtf],vgtCircle,0,true) end AddVisualGear(fThiefX[wtf], fThiefY[wtf], vgtBigExplosion, 0, false) @@ -290,14 +290,14 @@ fGearTimer = 0 fGearRad = fGearRad + 1 if fGearRad > fGearRadMax then - fGearRad = fGearRadMin + fGearRad = fGearRadMin end end for i = 0, 1 do - + --SetVisualGearValues(fSpawnC[i], fSpawnX[i],fSpawnY[i], 20, 200, 0, 0, 100, 50, 3, fCol[i]) -- draw a circ for spawning area - + if fIsMissing[i] == false then -- draw a flag marker at the flag's spawning place SetVisualGearValues(fCirc[i], fSpawnX[i],fSpawnY[i], 20, 20, 0, 10, 0, 33, 3, fCol[i]) if fGear[i] ~= nil then -- draw the flag gear itself @@ -308,12 +308,12 @@ SetVisualGearValues(fCirc[i], fThiefX[i], fThiefY[i], 20, 200, 0, 0, 100, 50, 3, fCol[i]) --AddCaption("circle marking carrier") elseif fThief[i] == nil then -- draw cirle round dropped flag - --g1X,g1Y,g4,g5,g6,g7,g8,g9,g10,g11 = GetVisualGearValues(fGear[i]) + --g1X,g1Y,g4,g5,g6,g7,g8,g9,g10,g11 = GetVisualGearValues(fGear[i]) --SetVisualGearValues(fCirc[i], g1X, g1Y, 20, 200, 0, 0, 100, 33, 2, fCol[i]) SetVisualGearValues(fCirc[i], fGearX[i], fGearY[i], 20, 200, 0, 0, 100, 33, 3, fCol[i]) - --AddCaption('dropped circle marker') + --AddCaption('dropped circle marker') if fGear[i] ~= nil then -- flag gear itself - --SetVisualGearValues(fGear[i], g1X, g1Y, 20, 200, 0, 0, 100, 10, 4, fCol[i]) + --SetVisualGearValues(fGear[i], g1X, g1Y, 20, 200, 0, 0, 100, 10, 4, fCol[i]) SetVisualGearValues(fGear[i], fGearX[i], fGearY[i], 20, 200, 0, 0, 100, fGearRad, 2, fCol[i]) --AddCaption('dropped flag itself') end @@ -410,13 +410,13 @@ for i = 0, 1 do - -- if someone uses kamikaze downwards, this can happen as the hog won't respawn + -- if someone uses kamikaze downwards, this can happen as the hog won't respawn if (LAND_HEIGHT - fSpawnY[i]) < 0 then tempG = AddGear(0, 0, gtTarget, 0, 0, 0, 0) - FindPlace(tempG, true, 0, LAND_WIDTH, true) + FindPlace(tempG, true, 0, LAND_WIDTH, true) fSpawnX[i], fSpawnY[i] = GetGearPosition(tempG) DeleteGear(tempG) - end + end fGear[i] = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true) fCirc[i] = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true) @@ -429,11 +429,11 @@ fIsMissing[i] = false fNeedsRespawn[i] = false fCaptures[i] = 0 - - --SetVisualGearValues(zxc, 1000,1000, 20, 100, 0, 10, 1, 100, 5, GetClanColor(0)) - + + --SetVisualGearValues(zxc, 1000,1000, 20, 100, 0, 10, 1, 100, 5, GetClanColor(0)) + SetVisualGearValues(fSpawnC[i], fSpawnX[i],fSpawnY[i], 20, 100, 0, 10, 0, 75, 5, fCol[i]) - + end end @@ -446,8 +446,8 @@ GameFlags = band(bor(GameFlags, gfDivideTeams), bnot(gfKing + gfForts)) --SuddenDeathTurns = 999 -- suddendeath is off, effectively - WaterRise = 0 - Delay = 10 + WaterRise = 0 + Delay = 10 end @@ -458,8 +458,8 @@ ShowMission(loc("CAPTURE THE FLAG"), loc("Flags, and their home base will be placed where each team ends their first turn."), "", 0, 0) RebuildTeamInfo() - - -- should gfDivideTeams do this automatically? + + -- should gfDivideTeams do this automatically? --[[for i = 0, (TeamsCount-1) do for g = teamIndex[i], (teamIndex[i]+teamSize[i]-1) do if GetHogClan(hhs[g]) == 0 then @@ -475,7 +475,7 @@ --zxc = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true) - + --SetVisualGearValues(zxc, 1000,1000, 20, 255, 1, 10, 0, 200, 1, GetClanColor(0)) --minO,max0 -glowyornot --pulsate timer -- fuckall -- radius -- width -- colour end @@ -484,7 +484,7 @@ function onNewTurn() gameTurns = gameTurns + 1 - + if lastTeam ~= GetHogTeamName(CurrentHedgehog) then lastTeam = GetHogTeamName(CurrentHedgehog) end @@ -492,14 +492,14 @@ --AddCaption("Handling respawns") if gameStarted == true then HandleRespawns() - --new method of placing starting flags + --new method of placing starting flags elseif gameTurns == 1 then ShowMission(loc("CAPTURE THE FLAG"), loc("Flags, and their home base will be placed where each team ends their first turn."), "", 0, 0) elseif gameTurns == 2 then fPlaced[0] = true ShowMission(loc("CAPTURE THE FLAG"), loc("RULES OF THE GAME [Press ESC to view]"), loc(" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"), 0, 0) elseif gameTurns == 3 then - fPlaced[1] = true + fPlaced[1] = true StartTheGame() end @@ -535,16 +535,16 @@ CheckFlagProximity() end elseif CurrentHedgehog ~= nil then -- if the game hasn't started yet, keep track of where we are gonna put the flags on turn end - + if GetHogClan(CurrentHedgehog) == 0 then - i = 0 + i = 0 elseif GetHogClan(CurrentHedgehog) == 1 then - i = 1 - end - + i = 1 + end + fSpawnX[i] = GetX(CurrentHedgehog) fSpawnY[i] = GetY(CurrentHedgehog) - + end end @@ -575,14 +575,14 @@ function InABetterPlaceNow(gear) for i = 0, (numhhs-1) do if gear == hhs[i] then - + for i = 0,1 do if gear == fThief[i] then FlagThiefDead(gear) end - end - hhs[i] = nil - end + end + hhs[i] = nil + end end end @@ -591,11 +591,11 @@ end function onHogRestore(gear) - match = false + match = false for i = 0, (numhhs-1) do if (hhs[i] == nil) and (match == false) then hhs[i] = gear - --AddCaption(GetHogName(gear) .. " has reappeared it seems!") + --AddCaption(GetHogName(gear) .. " has reappeared it seems!") match = true end end @@ -608,12 +608,12 @@ hhs[numhhs] = gear numhhs = numhhs + 1 SetEffect(gear, heResurrectable, true) - + elseif GetGearType(gear) == gtPiano then for i = 0, 1 do if CurrentHedgehog == fThief[i] then - FlagThiefDead(gear) + FlagThiefDead(gear) end end @@ -624,7 +624,7 @@ function onGearDelete(gear) if GetGearType(gear) == gtHedgehog then - InABetterPlaceNow(gear) + InABetterPlaceNow(gear) end end diff -r a6eab1b7c00d -r a416f1070fdf share/hedgewars/Data/Scripts/Multiplayer/No_Jumping.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/No_Jumping.lua Fri Sep 09 15:36:30 2011 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/No_Jumping.lua Fri Sep 09 15:52:59 2011 +0200 @@ -15,7 +15,7 @@ end function onGearAdd(gear) - + if (GetGearType(gear) == gtJetpack) or (GetGearType(gear) == gtRope) or (GetGearType(gear) == gtParachute) then specialGear = gear SetInputMask(band(0xFFFFFFFF, bnot(gmHJump))) diff -r a6eab1b7c00d -r a416f1070fdf share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua Fri Sep 09 15:36:30 2011 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua Fri Sep 09 15:52:59 2011 +0200 @@ -73,7 +73,7 @@ -- delete explosives in DeleteFarFlungBarrel rather than explode them on map boundaries to save on performance -- utilized the improved AddCaption to tint / prevent overrides -- temporarily disabled bugged sort that displays teams according to their score --- reluctantly changed the colour of the bonus circ to purple +-- reluctantly changed the colour of the bonus circ to purple -- standarized point notation -- added some missing locs -- commented out remaining WriteLnToConsoles for the meanwhile with the prefix "nw" @@ -128,7 +128,7 @@ capgrpAmmostate ----------------- AddCaption( chainLength .. LOC_NOT("-chain! +") .. chainLength*2 .. LOC_NOT(" points!"),0xffba00ff,capgrpAmmostate) -AddCaption(LOC_NOT("Multi-shot! +5 points!"),0xffba00ff,capgrpAmmostate) +AddCaption(LOC_NOT("Multi-shot! +5 points!"),0xffba00ff,capgrpAmmostate) ----------------- capgrpAmmoinfo @@ -145,7 +145,7 @@ AddCaption(LOC_NOT("Accuracy Bonus! +15 points!"),0xffba00ff,capgrpVolume) ----------------- -capgrpMessage +capgrpMessage ----------------- AddCaption(LOC_NOT("Ammo Depleted!"),0xff0000ff,capgrpMessage) AddCaption(LOC_NOT("Ammo: ") .. primShotsLeft) @@ -165,7 +165,7 @@ AddCaption(LOC_NOT("Timed Kamikaze! +10 points!"),0xffba00ff,capgrpMessage) ----------------- -capgrpMessage2 +capgrpMessage2 ----------------- AddCaption(LOC_NOT("Drone Hunter! +10 points!"),0xffba00ff,capgrpMessage2) AddCaption(LOC_NOT("Ammo Maniac! +5 points!"),0xffba00ff,capgrpMessage2) @@ -227,7 +227,7 @@ local SK = 0 local shieldMiser = true local chainCounter = 0 -local chainLength = 0 +local chainLength = 0 local shotsFired = 0 local shotsHit = 0 @@ -315,24 +315,24 @@ end function DrawTag(i) - + zoomL = 1.3 xOffset = 40 if i == 0 then - yOffset = 40 + yOffset = 40 tCol = 0xffba00ff tValue = TimeLeft elseif i == 1 then - zoomL = 1.1 - yOffset = 70 + zoomL = 1.1 + yOffset = 70 tCol = 0x00ff00ff tValue = primShotsLeft elseif i == 2 then - zoomL = 1.1 + zoomL = 1.1 xOffset = 40 + 35 - yOffset = 70 + yOffset = 70 tCol = 0xa800ffff tValue = shieldHealth - 80 end @@ -340,7 +340,7 @@ DeleteVisualGear(vTag[i]) vTag[i] = AddVisualGear(0, 0, vgtHealthTag, 0, false) g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(vTag[i]) - SetVisualGearValues ( + SetVisualGearValues ( vTag[i], --id -(ScreenWidth/2) + xOffset, --xoffset ScreenHeight - yOffset, --yoffset @@ -628,8 +628,8 @@ (GetX(gear) > 6200) or (GetY(gear) < -3400) then - AddVisualGear(GetX(gear), GetY(gear), vgtBigExplosion, 0, false) - DeleteGear(gear) + AddVisualGear(GetX(gear), GetY(gear), vgtBigExplosion, 0, false) + DeleteGear(gear) --SetHealth(gear, 0) --WriteLnToConsole("I'm setting barrel ID " .. getGearValue(gear,"ID") .. " to 0 health because it's been flung too close to the map edges. at Game Time: " .. GameTime .. "; luaTicks: " .. luaGameTicks) end @@ -651,8 +651,8 @@ -- Fire Barrel if (primShotsLeft > 0) and (CurrentHedgehog ~= nil) and (stopMovement == false) and (tumbleStarted == true) then - shotsFired = shotsFired +1 - + shotsFired = shotsFired +1 + morte = AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtExplosives, 0, 0, 0, 1) primShotsLeft = primShotsLeft - 1 @@ -757,8 +757,8 @@ MinesNum = 0 Explosives = 0 - for i = 0, 3 do - vTag[0] = AddVisualGear(0, 0, vgtHealthTag, 0, false) + for i = 0, 3 do + vTag[0] = AddVisualGear(0, 0, vgtHealthTag, 0, false) end HideTags() @@ -852,7 +852,7 @@ tumbleStarted = false SetMyCircles(false) end - + HideTags() --------------- @@ -879,8 +879,8 @@ function onGameTick() - - --WriteLnToConsole("Start of GameTick") + + --WriteLnToConsole("Start of GameTick") luaGameTicks = luaGameTicks + 1 -- GameTime HandleCircles() @@ -972,9 +972,9 @@ if PlayerIsFine() == false then TimeLeft = 0 end - + --WriteLnToConsole("successfully checked playerIsFine") - + if (TimeLeft == 0) then if (stopMovement == false) then --time to stop the player stopMovement = true @@ -1002,16 +1002,16 @@ ------------------------------- -- Player is still in luck ------------------------------- - + --WriteLnToConsole("about to do chainCounter checks") if chainCounter > 0 then - chainCounter = chainCounter -1 + chainCounter = chainCounter -1 if chainCounter == 0 then chainLength = 0 end end - + -- handle movement based on IO moveTimer = moveTimer + 1 if moveTimer == 100 then -- 100 @@ -1582,7 +1582,7 @@ circsHit = circsHit + 1 if circsHit > 1 then - AddCaption(loc("Multi-shot!") .. " +5 " .. loc("points") .. "!",0xffba00ff,capgrpAmmostate) + AddCaption(loc("Multi-shot!") .. " +5 " .. loc("points") .. "!",0xffba00ff,capgrpAmmostate) end shotsHit = shotsHit + 1 @@ -1879,12 +1879,12 @@ FadeAlpha = 255 end - --new + --new --if FadeAlpha == 1 then - -- AddCaption("GOT IT") + -- AddCaption("GOT IT") -- for i = 0,(vCCount-1) do -- g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(vCirc[i]) - -- vCircCol[i] = g10 + -- vCircCol[i] = g10 -- end --end diff -r a6eab1b7c00d -r a416f1070fdf share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua Fri Sep 09 15:36:30 2011 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua Fri Sep 09 15:52:59 2011 +0200 @@ -259,42 +259,42 @@ if (CurrentHedgehog ~= nil) then currName = GetHogName(CurrentHedgehog) - + if (currName ~= lastName) and (switchStage > 100) then AddCaption(loc("Switched to ") .. currName .. "!") - AssignAmmo() + AssignAmmo() end - if (TurnTimeLeft > 0) and (TurnTimeLeft ~= TurnTime) and (switchStage < 100) then - - AddCaption(loc("Prepare yourself") .. ", " .. currName .. "!") + if (TurnTimeLeft > 0) and (TurnTimeLeft ~= TurnTime) and (switchStage < 100) then + + AddCaption(loc("Prepare yourself") .. ", " .. currName .. "!") hogCounter = 0 runOnHogsInTeam(CountHog, GetHogTeamName(CurrentHedgehog) ) if hogCounter > 1 then - switchStage = switchStage + 1 - + switchStage = switchStage + 1 + if switchStage == 1 then AddAmmo(CurrentHedgehog, amSwitch, 1) - + elseif switchStage == 2 then ParseCommand("setweap " .. string.char(amSwitch)) elseif switchStage == 3 then - SetGearMessage(CurrentHedgehog,gmAttack) + SetGearMessage(CurrentHedgehog,gmAttack) elseif switchStage == 4 then switchStage = 110 AddAmmo(CurrentHedgehog, amSwitch, 0) end - + else switchStage = 110 end - end - + end + lastName = currName end @@ -307,12 +307,12 @@ hhs[numhhs] = gear numhhs = numhhs + 1 elseif (GetGearType(gear) == gtMine) and (started == true) then - SetTimer(gear,5000) + SetTimer(gear,5000) end - + if (GetGearType(gear) == gtHedgehog) or (GetGearType(gear) == gtResurrector) then trackGear(gear) - end + end end @@ -320,7 +320,7 @@ function onGearDelete(gear) if (GetGearType(gear) == gtHedgehog) or (GetGearType(gear) == gtResurrector) then trackDeletion(gear) - end + end end function onAmmoStoreInit() diff -r a6eab1b7c00d -r a416f1070fdf share/hedgewars/Data/Scripts/Multiplayer/Tumbler.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Tumbler.lua Fri Sep 09 15:36:30 2011 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Tumbler.lua Fri Sep 09 15:52:59 2011 +0200 @@ -200,37 +200,37 @@ function HideTags() - for i = 0, 3 do + for i = 0, 3 do SetVisualGearValues(vTag[i],0,0,0,0,0,1,0, 0, 240000, 0xffffff00) end end function DrawTag(i) - + zoomL = 1.3 xOffset = 40 if i == 0 then - yOffset = 40 + yOffset = 40 tCol = 0xffba00ff --0xffed09ff --0xffba00ff tValue = TimeLeft elseif i == 1 then - zoomL = 1.1 - yOffset = 70 + zoomL = 1.1 + yOffset = 70 tCol = wepCol[0] tValue = wepAmmo[0] elseif i == 2 then - zoomL = 1.1 + zoomL = 1.1 xOffset = 40 + 35 - yOffset = 70 + yOffset = 70 tCol = wepCol[1] tValue = wepAmmo[1] elseif i == 3 then - zoomL = 1.1 + zoomL = 1.1 xOffset = 40 + 70 - yOffset = 70 + yOffset = 70 tCol = wepCol[2] tValue = wepAmmo[2] end @@ -238,7 +238,7 @@ DeleteVisualGear(vTag[i]) vTag[i] = AddVisualGear(0, 0, vgtHealthTag, 0, false) g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(vTag[i]) - SetVisualGearValues ( + SetVisualGearValues ( vTag[i], --id -(ScreenWidth/2) + xOffset, --xoffset ScreenHeight - yOffset, --yoffset @@ -278,19 +278,19 @@ DeleteGear(gear) AddCaption(wep[0] .. " " .. loc("ammo extended!"), wepCol[0], capgrpAmmoinfo ) DrawTag(1) - + barrelsEaten = barrelsEaten + 1 if barrelsEaten == 5 then AddCaption(loc("Achievement Unlocked") .. ": " .. loc("Barrel Eater!"),0xffba00ff,capgrpMessage2) end - + elseif (GetGearType(gear) == gtMine) then wepAmmo[1] = wepAmmo[1] + 1 PlaySound(sndShotgunReload) DeleteGear(gear) AddCaption(wep[1] .. " " .. loc("ammo extended!"), wepCol[1], capgrpAmmoinfo ) DrawTag(2) - + minesEaten = minesEaten + 1 if minesEaten == 5 then AddCaption(loc("Achievement Unlocked") .. ": " .. loc("Mine Eater!"),0xffba00ff,capgrpMessage2) @@ -314,7 +314,7 @@ if GetHealth(gear) > 0 then AddCaption(loc("Tumbling Time Extended!"), 0xffba00ff, capgrpMessage2 ) - + TimeLeft = TimeLeft + HealthCaseAmount --5 --5s DrawTag(0) --PlaySound(sndShotgunReload) @@ -442,31 +442,31 @@ mineSpawn = MinesNum if mineSpawn > 4 then - mineSpawn = 4 + mineSpawn = 4 end barrelSpawn = Explosives if barrelSpawn > 4 then - barrelSpawn = 4 + barrelSpawn = 4 end --MinesNum = 0 --Explosives = 0 - for i = 0, 3 do - vTag[0] = AddVisualGear(0, 0, vgtHealthTag, 0, false) + for i = 0, 3 do + vTag[0] = AddVisualGear(0, 0, vgtHealthTag, 0, false) end HideTags() wep[0] = loc("Barrel Launcher") - wep[1] = loc("Mine Deployer") + wep[1] = loc("Mine Deployer") wep[2] = loc("Flamer") wepCol[0] = 0x78818eff wepCol[1] = 0xa12a77ff wepCol[2] = 0xf49318ff - + wepCount = 3 end @@ -544,7 +544,7 @@ --reset ammo counts wepAmmo[0] = 2 - wepAmmo[1] = 1 + wepAmmo[1] = 1 wepAmmo[2] = 50 -- 50000 -- 50 wepIndex = 2 ChangeWeapon() @@ -579,7 +579,7 @@ SetHealth(CurrentHedgehog, GetHealth(CurrentHedgehog) + 47) -- new for i = 0, 3 do DrawTag(i) - end + end end end