# HG changeset patch # User sheepluva # Date 1452457991 -3600 # Node ID df990633cb251f737a21af8783484abf3df50ccf # Parent 62da13a15affe2a3136889dfeb6193212d3fd852# Parent 9cdc4ba2104dda8fd001c2a5065e8f02371a2197 merge Wuzzy's highlanderfix and statsicons bookmarks. diff -r 62da13a15aff -r df990633cb25 QTfrontend/res/StatsBestKiller.png Binary file QTfrontend/res/StatsBestKiller.png has changed diff -r 62da13a15aff -r df990633cb25 QTfrontend/res/StatsCustomAchievement.png Binary file QTfrontend/res/StatsCustomAchievement.png has changed diff -r 62da13a15aff -r df990633cb25 QTfrontend/res/StatsHedgehogsKilled.png Binary file QTfrontend/res/StatsHedgehogsKilled.png has changed diff -r 62da13a15aff -r df990633cb25 QTfrontend/res/StatsMostSelfDamage.png Binary file QTfrontend/res/StatsMostSelfDamage.png has changed diff -r 62da13a15aff -r df990633cb25 QTfrontend/res/StatsSelfKilled.png Binary file QTfrontend/res/StatsSelfKilled.png has changed diff -r 62da13a15aff -r df990633cb25 QTfrontend/res/StatsSkipped.png Binary file QTfrontend/res/StatsSkipped.png has changed diff -r 62da13a15aff -r df990633cb25 share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua Sun Jan 10 21:14:06 2016 +0100 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua Sun Jan 10 21:33:11 2016 +0100 @@ -242,6 +242,8 @@ EnableGameFlags(gfInfAttack, gfRandomOrder, gfPerHogAmmo) DisableGameFlags(gfResetWeps, gfSharedAmmo) HealthCaseProb = 100 + Goals = loc("Highlander: Eliminate enemy hogs and take their weapons.") .."|" .. + loc("Weapons are reset on end of turn.") end function onGameStart() @@ -271,16 +273,6 @@ --WriteLnToConsole('utiltot:'..utiltot..' atktot:'..atktot) - ShowMission ( - loc("HIGHLANDER"), - loc("Not all hogs are born equal."), - - "- " .. loc("Eliminate enemy hogs and take their weapons.") .. "|" .. - "- " .. loc("Per-Hog Ammo") .. "|" .. - "- " .. loc("Weapons reset.") .. "|" .. - "- " .. loc("Unlimited Attacks") .. "|" .. - "", 4, 4000 - ) runOnGears(StartingSetUp) runOnGears(ConvertValues)