# HG changeset patch # User Wuzzy # Date 1479906523 -3600 # Node ID cfc2f087dccf91c6fcd928e7c8eb3aca824c4a2f # Parent 477f3b3d00d8b310cba4ab1121f845a7475f752e HedgeEditor: Make landgun spawn in utility crates and sort list of ammo types to reflect the ammo menu ordering diff -r 477f3b3d00d8 -r cfc2f087dccf share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua Wed Nov 23 13:59:36 2016 +0100 +++ b/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua Wed Nov 23 14:08:43 2016 +0100 @@ -329,6 +329,7 @@ local atkArray = { + {amBazooka, "amBazooka", 2}, {amBee, "amBee", 3}, {amMortar, "amMortar", 21}, @@ -337,18 +338,17 @@ {amGrenade, "amGrenade", 0}, {amClusterBomb, "amClusterBomb", 1}, - {amMolotov, "amMolotov", 39}, {amWatermelon, "amWatermelon", 25}, {amHellishBomb, "amHellishBomb", 26}, + {amMolotov, "amMolotov", 39}, {amGasBomb, "amGasBomb", 43}, {amShotgun, "amShotgun", 4}, {amDEagle, "amDEagle", 9}, - {amFlamethrower,"amFlamethrower", 45}, {amSniperRifle, "amSniperRifle", 37}, {amSineGun, "amSineGun", 44}, + {amFlamethrower,"amFlamethrower", 45}, {amIceGun, "amIceGun", 53}, - {amLandGun, "amLandGun", 52}, {amFirePunch, "amFirePunch", 11}, {amWhip, "amWhip", 12}, @@ -366,10 +366,10 @@ {amAirAttack, "amAirAttack", 15}, {amMineStrike, "amMineStrike", 16}, + {amNapalm, "amNapalm", 27}, + {amPiano, "amPiano", 42}, {amDrillStrike, "amDrillStrike", 49}, {amAirMine, "amAirMine", 56}, - {amNapalm, "amNapalm", 27}, - {amPiano, "amPiano", 42}, {amKnife, "amKnife", 54}, @@ -379,29 +379,30 @@ local utilArray = { + + {amPickHammer, "amPickHammer", 5}, {amBlowTorch, "amBlowTorch", 17}, - {amPickHammer, "amPickHammer", 5}, {amGirder, "amGirder", 18}, + {amLandGun, "amLandGun", 52}, {amRubber, "amRubber", 55}, - {amPortalGun, "amPortalGun", 41}, {amRope, "amRope", 7}, {amParachute, "amParachute", 14}, {amTeleport, "amTeleport", 19}, {amJetpack, "amJetpack", 38}, + {amPortalGun, "amPortalGun", 41}, {amInvulnerable,"amInvulnerable", 33}, {amLaserSight, "amLaserSight", 35}, {amVampiric, "amVampiric", 36}, - - {amLowGravity, "amLowGravity", 31}, - {amExtraDamage, "amExtraDamage", 32}, - {amExtraTime, "amExtraTime", 34}, - {amResurrector, "amResurrector", 48}, {amTardis, "amTardis", 51}, {amSwitch, "amSwitch", 20}, + {amLowGravity, "amLowGravity", 31}, + {amExtraDamage, "amExtraDamage", 32}, + {amExtraTime, "amExtraTime", 34}, + } --skiphog is 6