# HG changeset patch # User Henek # Date 1289140220 -10800 # Node ID 923db448ad16f2b1d362da692395a9dfecc451fe # Parent 1f19dcdabe193806813d89fe11b2461e220e4323 update and fix some lua stuff diff -r 1f19dcdabe19 -r 923db448ad16 hedgewars/uScript.pas --- a/hedgewars/uScript.pas Sun Nov 07 17:02:04 2010 +0300 +++ b/hedgewars/uScript.pas Sun Nov 07 17:30:20 2010 +0300 @@ -830,11 +830,15 @@ ScriptSetString('Seed', cSeed); ScriptSetInteger('TurnTime', cHedgehogTurnTime); ScriptSetInteger('CaseFreq', cCaseFactor); +ScriptSetInteger('HealthCaseProb', cHealthCaseProb); +ScriptSetInteger('HealthCaseAmount', cHealthCaseAmount); ScriptSetInteger('MinesNum', cLandMines); ScriptSetInteger('Explosives', cExplosives); ScriptSetInteger('Delay', cInactDelay); ScriptSetInteger('Ready', cReadyDelay); ScriptSetInteger('SuddenDeathTurns', cSuddenDTurns); +ScriptSetInteger('WaterRise', cWaterRise); +ScriptSetInteger('HealthDecrease', cHealthDecrease); ScriptSetString('Map', ''); ScriptSetString('Theme', ''); @@ -851,11 +855,15 @@ ParseCommand('$gmflags ' + ScriptGetString('GameFlags'), true); ParseCommand('$turntime ' + ScriptGetString('TurnTime'), true); ParseCommand('$casefreq ' + ScriptGetString('CaseFreq'), true); +ParseCommand('$healthprob ' + ScriptGetString('HealthCaseProb'), true); +ParseCommand('$hcaseamount ' + ScriptGetString('HealthCaseAmount'), true); ParseCommand('$minesnum ' + ScriptGetString('MinesNum'), true); ParseCommand('$explosives ' + ScriptGetString('Explosives'), true); ParseCommand('$delay ' + ScriptGetString('Delay'), true); ParseCommand('$ready ' + ScriptGetString('Ready'), true); ParseCommand('$sd_turns ' + ScriptGetString('SuddenDeathTurns'), true); +ParseCommand('$waterrise ' + ScriptGetString('WaterRise'), true); +ParseCommand('$healthdec ' + ScriptGetString('HealthDecrease'), true); if ScriptGetString('Map') <> '' then ParseCommand('map ' + ScriptGetString('Map'), true); if ScriptGetString('Theme') <> '' then @@ -1048,6 +1056,11 @@ ScriptSetInteger('gfPlaceHog', gfPlaceHog); ScriptSetInteger('gfSharedAmmo', gfSharedAmmo); ScriptSetInteger('gfDisableGirders', gfDisableGirders); +ScriptSetInteger('gfDisableLandObjects', gfDisableLandObjects); +ScriptSetInteger('gfAISurvival', gfAISurvival); +ScriptSetInteger('gfInfAttack', gfInfAttack); +ScriptSetInteger('gfResetWeps', gfResetWeps); +ScriptSetInteger('gfPerHogAmmo', gfPerHogAmmo); ScriptSetInteger('gmLeft', gmLeft); ScriptSetInteger('gmRight', gmRight); diff -r 1f19dcdabe19 -r 923db448ad16 share/hedgewars/Data/Maps/Basketball/map.lua --- a/share/hedgewars/Data/Maps/Basketball/map.lua Sun Nov 07 17:02:04 2010 +0300 +++ b/share/hedgewars/Data/Maps/Basketball/map.lua Sun Nov 07 17:30:20 2010 +0300 @@ -96,7 +96,7 @@ GameFlags = gfSolidLand + gfBorder + gfInvulnerable + gfLowGravity TurnTime = 20000 CaseFreq = 0 - LandAdds = 0 + MinesNum = 0 Explosives = 0 Delay = 500 SuddenDeathTurns = 99999 -- "disable" sudden death diff -r 1f19dcdabe19 -r 923db448ad16 share/hedgewars/Data/Maps/FlightJoust/map.lua --- a/share/hedgewars/Data/Maps/FlightJoust/map.lua Sun Nov 07 17:02:04 2010 +0300 +++ b/share/hedgewars/Data/Maps/FlightJoust/map.lua Sun Nov 07 17:30:20 2010 +0300 @@ -29,7 +29,7 @@ GameFlags = gfSolidLand + gfDivideTeams TurnTime = 10000 CaseFreq = 0 - LandAdds = 0 + MinesNum = 0 Explosives = 0 Delay = 500 SuddenDeathTurns = 99999 -- "disable" sudden death @@ -76,4 +76,4 @@ if GetGearType(gear) == gtCase then spawncrate = 1 end -end \ No newline at end of file +end diff -r 1f19dcdabe19 -r 923db448ad16 share/hedgewars/Data/Maps/Knockball/map.lua --- a/share/hedgewars/Data/Maps/Knockball/map.lua Sun Nov 07 17:02:04 2010 +0300 +++ b/share/hedgewars/Data/Maps/Knockball/map.lua Sun Nov 07 17:30:20 2010 +0300 @@ -69,7 +69,7 @@ GameFlags = gfSolidLand + gfInvulnerable + gfDivideTeams TurnTime = 20000 CaseFreq = 0 - LandAdds = 0 + MinesNum = 0 Explosives = 0 Delay = 500 SuddenDeathTurns = 99999 -- "disable" sudden death diff -r 1f19dcdabe19 -r 923db448ad16 share/hedgewars/Data/Maps/TrophyRace/map.lua --- a/share/hedgewars/Data/Maps/TrophyRace/map.lua Sun Nov 07 17:02:04 2010 +0300 +++ b/share/hedgewars/Data/Maps/TrophyRace/map.lua Sun Nov 07 17:30:20 2010 +0300 @@ -2,32 +2,40 @@ local caption = { ["en"] = "TrophyRace", + ["sv"] = "TrophyRace", } local goal = { ["en"] = "Use your rope to get from start to finish as fast as you can!", + ["sv"] = "Använd ditt rep för att ta dig från start till mål så fort som möjligt!", } local done = { ["en"] = "You've reached the goal!| |Time: ", + ["sv"] = "Du har nått målet!| |Tid: ", } local eliminated = { ["en"] = "Eliminating worst hedgehog this round...| |%s is OUT!", + ["sv"] = "Eliminerar sämsta igelkott den här rundan...| |%s är UTE!", } local newbesttime = { ["en"] = "NEW fastest lap: ", + ["sv"] = "NYTT snabbast varv: ", } local oldbesttime = { ["en"] = "Fastest lap: ", + ["sv"] = "Snabbast varv: ", } local bestclantimes = { ["en"] = "Best laps per team: ", + ["sv"] = "Bästa varv per lag: ", } local clantime = { ["en"] = "Team %d: ", + ["sv"] = "Lag %d: ", } local function loc(text) @@ -82,7 +90,7 @@ GameFlags = gfSolidLand + gfInvulnerable TurnTime = maxtime CaseFreq = 0 - LandAdds = 0 + MinesNum = 0 Explosives = 0 Delay = 500 SuddenDeathTurns = 99999 -- "disable" sudden death diff -r 1f19dcdabe19 -r 923db448ad16 share/hedgewars/Data/Missions/Campaign/01#Boot Camp.lua --- a/share/hedgewars/Data/Missions/Campaign/01#Boot Camp.lua Sun Nov 07 17:02:04 2010 +0300 +++ b/share/hedgewars/Data/Missions/Campaign/01#Boot Camp.lua Sun Nov 07 17:30:20 2010 +0300 @@ -270,7 +270,7 @@ GameFlags = gfMultiWeapon + gfOneClanMode TurnTime = 25000 CaseFreq = 0 - LandAdds = 0 + MinesNum = 0 Explosives = 0 Delay = 2500 Map = "Mushrooms" diff -r 1f19dcdabe19 -r 923db448ad16 share/hedgewars/Data/Missions/Training/Bazooka.lua --- a/share/hedgewars/Data/Missions/Training/Bazooka.lua Sun Nov 07 17:02:04 2010 +0300 +++ b/share/hedgewars/Data/Missions/Training/Bazooka.lua Sun Nov 07 17:30:20 2010 +0300 @@ -153,7 +153,7 @@ -- The frequency of crate drops CaseFreq = 0 -- The number of mines being placed - LandAdds = 0 + MinesNum = 0 -- The number of explosives being placed Explosives = 0 -- The delay between each round diff -r 1f19dcdabe19 -r 923db448ad16 share/hedgewars/Data/Missions/Training/Shotgun.lua --- a/share/hedgewars/Data/Missions/Training/Shotgun.lua Sun Nov 07 17:02:04 2010 +0300 +++ b/share/hedgewars/Data/Missions/Training/Shotgun.lua Sun Nov 07 17:30:20 2010 +0300 @@ -153,7 +153,7 @@ -- The frequency of crate drops CaseFreq = 0 -- The number of mines being placed - LandAdds = 0 + MinesNum = 0 -- The number of explosives being placed Explosives = 0 -- The delay between each round diff -r 1f19dcdabe19 -r 923db448ad16 share/hedgewars/Data/Missions/Training/SniperRifle.lua --- a/share/hedgewars/Data/Missions/Training/SniperRifle.lua Sun Nov 07 17:02:04 2010 +0300 +++ b/share/hedgewars/Data/Missions/Training/SniperRifle.lua Sun Nov 07 17:30:20 2010 +0300 @@ -153,7 +153,7 @@ -- The frequency of crate drops CaseFreq = 0 -- The number of mines being placed - LandAdds = 0 + MinesNum = 0 -- The number of explosives being placed Explosives = 0 -- The delay between each round