--- a/share/hedgewars/Data/Scripts/Multiplayer/Construction_Mode.lua Tue Nov 22 21:30:23 2016 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Construction_Mode.lua Wed Nov 23 00:17:28 2016 +0100
@@ -937,39 +937,39 @@
placeholder = 20
atkArray =
{
- {amBazooka, "amBazooka", 0, loc("Bazooka"), 2*placeholder},
+ {amBazooka, "amBazooka", 0, 2*placeholder},
--{amBee, "amBee", 0, loc("Homing Bee"), 4*placeholder},
- {amMortar, "amMortar", 0, loc("Mortar"), 1*placeholder},
- {amDrill, "amDrill", 0, loc("Drill Rocket"), 3*placeholder},
- {amSnowball, "amSnowball", 0, loc("Mudball"), 3*placeholder},
+ {amMortar, "amMortar", 0, 1*placeholder},
+ {amDrill, "amDrill", 0, 3*placeholder},
+ {amSnowball, "amSnowball", 0, 3*placeholder},
- {amGrenade, "amGrenade", 0, loc("Grenade"), 2*placeholder},
- {amClusterBomb, "amClusterBomb", 0, loc("Cluster Bomb"), 3*placeholder},
- {amWatermelon, "amWatermelon", 0, loc("Watermelon Bomb"), 25*placeholder},
- {amHellishBomb, "amHellishBomb", 0, loc("Hellish hand-grenade"), 25*placeholder},
- {amMolotov, "amMolotov", 0, loc("Molotov Cocktail"), 3*placeholder},
- {amGasBomb, "amGasBomb", 0, loc("Old Limburger"), 3*placeholder},
+ {amGrenade, "amGrenade", 0, 2*placeholder},
+ {amClusterBomb, "amClusterBomb", 0, 3*placeholder},
+ {amWatermelon, "amWatermelon", 0, 25*placeholder},
+ {amHellishBomb, "amHellishBomb", 0, 25*placeholder},
+ {amMolotov, "amMolotov", 0, 3*placeholder},
+ {amGasBomb, "amGasBomb", 0, 3*placeholder},
- {amShotgun, "amShotgun", 0, loc("Shotgun"), 2*placeholder},
- {amDEagle, "amDEagle", 0, loc("Desert Eagle"), 2*placeholder},
- {amSniperRifle, "amSniperRifle", 0, loc("Sniper Rifle"), 3*placeholder},
+ {amShotgun, "amShotgun", 0, 2*placeholder},
+ {amDEagle, "amDEagle", 0, 2*placeholder},
+ {amSniperRifle, "amSniperRifle", 0, 3*placeholder},
--{amSineGun, "amSineGun", 0, loc("Sine Gun"), 6*placeholder},
- {amFlamethrower,"amFlamethrower", 0, loc("Flamethrower"), 4*placeholder},
- {amIceGun, "amIceGun", 0, loc("Freezer"), 15*placeholder},
+ {amFlamethrower,"amFlamethrower", 0, 4*placeholder},
+ {amIceGun, "amIceGun", 0, 15*placeholder},
- {amFirePunch, "amFirePunch", 0, loc("Shoryuken"), 3*placeholder},
- {amWhip, "amWhip", 0, loc("Whip"), 1*placeholder},
- {amBaseballBat, "amBaseballBat", 0, loc("Baseball Bat"), 7*placeholder},
+ {amFirePunch, "amFirePunch", 0, 3*placeholder},
+ {amWhip, "amWhip", 0, 1*placeholder},
+ {amBaseballBat, "amBaseballBat", 0, 7*placeholder},
--{amKamikaze, "amKamikaze", 0, loc("Kamikaze"), 1*placeholder},
- {amSeduction, "amSeduction", 0, loc("Seduction"), 1*placeholder},
- {amHammer, "amHammer", 0, loc("Hammer"), 1*placeholder},
+ {amSeduction, "amSeduction", 0, 1*placeholder},
+ {amHammer, "amHammer", 0, 1*placeholder},
- {amMine, "amMine", 0, loc("Mine"), 1*placeholder},
- {amDynamite, "amDynamite", 0, loc("Dynamite"), 9*placeholder},
- {amCake, "amCake", 0, loc("Cake"), 25*placeholder},
- {amBallgun, "amBallgun", 0, loc("Ballgun"), 40*placeholder},
+ {amMine, "amMine", 0, 1*placeholder},
+ {amDynamite, "amDynamite", 0, 9*placeholder},
+ {amCake, "amCake", 0, 25*placeholder},
+ {amBallgun, "amBallgun", 0, 40*placeholder},
--{amRCPlane, "amRCPlane", 0, loc("RC Plane"), 25*placeholder},
- {amSMine, "amSMine", 0, loc("Sticky Mine"), 5*placeholder},
+ {amSMine, "amSMine", 0, 5*placeholder},
--{amAirAttack, "amAirAttack", 0, loc("Air Attack"), 10*placeholder},
--{amMineStrike, "amMineStrike", 0, loc("Mine Strike"), 15*placeholder},
@@ -977,36 +977,36 @@
--{amPiano, "amPiano", 0, loc("Piano Strike"), 40*placeholder},
--{amDrillStrike, "amDrillStrike", 0, loc("Drill Strike"), 15*placeholder},
- {amKnife, "amKnife", 0, loc("Cleaver"), 2*placeholder},
+ {amKnife, "amKnife", 0, 2*placeholder},
- {amBirdy, "amBirdy", 0, loc("Birdy"), 7*placeholder}
+ {amBirdy, "amBirdy", 0, 7*placeholder}
}
utilArray =
{
- {amPickHammer, "amPickHammer", 0, loc("Pick Hammer"), 2*placeholder},
- {amBlowTorch, "amBlowTorch", 0, loc("Blow Torch"), 4*placeholder},
+ {amPickHammer, "amPickHammer", 0, 2*placeholder},
+ {amBlowTorch, "amBlowTorch", 0, 4*placeholder},
--{amGirder, "amGirder", 0, loc("Girder"), 4*placeholder},
- {amLandGun, "amLandGun", 0, loc("Land Spray"), 5*placeholder},
+ {amLandGun, "amLandGun", 0, 5*placeholder},
--{amRubber, "amRubber", 0, loc("Rubber"), 5*placeholder},
- {amRope, "amRope", 0, loc("Rope"), 7*placeholder},
- {amParachute, "amParachute", 0, loc("Parachute"), 2*placeholder},
+ {amRope, "amRope", 0, 7*placeholder},
+ {amParachute, "amParachute", 0, 2*placeholder},
--{amTeleport, "amTeleport", 0, loc("Teleport"), 6*placeholder},
- {amJetpack, "amJetpack", 0, loc("Flying Saucer"), 8*placeholder},
- {amPortalGun, "amPortalGun", 0, loc("Portable Portal Device"), 15*placeholder},
+ {amJetpack, "amJetpack", 0, 8*placeholder},
+ {amPortalGun, "amPortalGun", 0, 15*placeholder},
- {amInvulnerable, "amInvulnerable", 0, loc("Invulnerable"), 5*placeholder},
- {amLaserSight, "amLaserSight", 0, loc("Laser Sight"), 2*placeholder},
- {amVampiric, "amVampiric", 0, loc("Vampirism"), 6*placeholder},
+ {amInvulnerable, "amInvulnerable", 0, 5*placeholder},
+ {amLaserSight, "amLaserSight", 0, 2*placeholder},
+ {amVampiric, "amVampiric", 0, 6*placeholder},
--{amResurrector, "amResurrector", 0, loc("Resurrector"), 8*placeholder},
--{amTardis, "amTardis", 0, loc("Time Box"), 2*placeholder},
--{amSwitch, "amSwitch", 0, loc("Switch Hog"), 4*placeholder}
- {amLowGravity, "amLowGravity", 0, loc("Low Gravity"), 4*placeholder},
- {amExtraDamage, "amExtraDamage", 0, loc("Extra Damage"), 6*placeholder},
- {amExtraTime, "amExtraTime", 0, loc("Extra Time"), 8*placeholder}
+ {amLowGravity, "amLowGravity", 0, 4*placeholder},
+ {amExtraDamage, "amExtraDamage", 0, 6*placeholder},
+ {amExtraTime, "amExtraTime", 0, 8*placeholder}
}
@@ -1197,14 +1197,14 @@
placedExpense = 5
elseif cat[cIndex] == "Weapon Crate Placement Mode" then
for i = 1, #atkArray do
- pMode[i] = atkArray[i][4]
+ pMode[i] = GetAmmoName(atkArray[i][1])
end
- placedExpense = atkArray[pIndex][5]
+ placedExpense = atkArray[pIndex][4]
elseif cat[cIndex] == "Utility Crate Placement Mode" then
for i = 1, #utilArray do
- pMode[i] = utilArray[i][4]
+ pMode[i] = GetAmmoName(utilArray[i][1])
end
- placedExpense = utilArray[pIndex][5]
+ placedExpense = utilArray[pIndex][4]
elseif cat[cIndex] == "Mine Placement Mode" then
pMode = {0,1000,2000,3000,4000,5000}
placedExpense = 15
@@ -1372,9 +1372,9 @@
elseif pMode[pIndex] == loc("Reflector Shield") then
placedExpense = 200
elseif cat[cIndex] == "Weapon Crate Placement Mode" then
- placedExpense = atkArray[pIndex][5]
+ placedExpense = atkArray[pIndex][4]
elseif cat[cIndex] == "Utility Crate Placement Mode" then
- placedExpense = utilArray[pIndex][5]
+ placedExpense = utilArray[pIndex][4]
end
AddCaption(loc("Cost") .. ": " .. placedExpense,0xffba00ff,capgrpAmmostate)