--- a/QTfrontend/hwconsts.cpp.in Wed Jul 23 11:55:47 2008 +0000
+++ b/QTfrontend/hwconsts.cpp.in Fri Jul 25 10:56:05 2008 +0000
@@ -28,7 +28,7 @@
QStringList * Themes;
-QString * cDefaultAmmoStore = new QString("eammstore 93919294221991210322351");
+QString * cDefaultAmmoStore = new QString("eammstore 939192942219912103223511");
QColor * color1 = new QColor( 0, 255, 255);
QColor * color2 = new QColor(255, 127, 127);
--- a/hedgewars/GSHandlers.inc Wed Jul 23 11:55:47 2008 +0000
+++ b/hedgewars/GSHandlers.inc Fri Jul 25 10:56:05 2008 +0000
@@ -1481,3 +1481,8 @@
Gear^.doStep:= @doStepKamikazeIdle
end;
+procedure doStepSpider(Gear: PGear);
+begin
+AfterAttack;
+DeleteGear(Gear);
+end;
--- a/hedgewars/HHHandlers.inc Wed Jul 23 11:55:47 2008 +0000
+++ b/hedgewars/HHHandlers.inc Fri Jul 25 10:56:05 2008 +0000
@@ -159,6 +159,7 @@
amSwitch: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtSwitcher, 0, _0, _0, 0);
amMortar: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtMortar, 0, xx*cMaxPower/cPowerDivisor, yy*cMaxPower/cPowerDivisor, 0);
amKamikaze: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtKamikaze, 0, xx * _0_5, yy * _0_5, 0);
+ amSpider: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtSpider, 0, xx, _0, 0);
end;
uStats.AmmoUsed(Ammo^[CurSlot, CurAmmo].AmmoType);
--- a/hedgewars/uAIAmmoTests.pas Wed Jul 23 11:55:47 2008 +0000
+++ b/hedgewars/uAIAmmoTests.pas Fri Jul 25 10:56:05 2008 +0000
@@ -67,7 +67,8 @@
(proc: nil; flags: amtest_OnTurn), // amTeleport
(proc: nil; flags: 0), // amSwitch
(proc: @TestMortar; flags: 0), // amMortar
- (proc: nil; flags: 0) // amKamikaze
+ (proc: nil; flags: 0), // amKamikaze
+ (proc: nil; flags: 0) // amSpider
);
const BadTurn = Low(LongInt) div 4;
--- a/hedgewars/uConsts.pas Wed Jul 23 11:55:47 2008 +0000
+++ b/hedgewars/uConsts.pas Fri Jul 25 10:56:05 2008 +0000
@@ -55,7 +55,7 @@
gtFirePunch, gtATStartGame, gtATSmoothWindCh, gtATFinishGame,
gtParachute, gtAirAttack, gtAirBomb, gtBlowTorch, gtGirder,
gtTeleport, gtSmallDamage, gtSwitcher, gtTarget, gtMortar,
- gtWhip, gtKamikaze);
+ gtWhip, gtKamikaze, gtSpider);
TVisualGearType = (vgtFlake, vgtCloud, vgtExplPart, vgtExplPart2, vgtFire);
@@ -72,7 +72,7 @@
TAmmoType = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer,
amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch, amWhip,
amBaseballBat, amParachute, amAirAttack, amMineStrike, amBlowTorch,
- amGirder, amTeleport, amSwitch, amMortar, amKamikaze);
+ amGirder, amTeleport, amSwitch, amMortar, amKamikaze, amSpider);
THWFont = (fnt16, fntBig, fntSmall);
@@ -939,6 +939,26 @@
isDamaging: true;
SkipTurns: 0;
PosCount: 1;
+ PosSprite: sprWater),
+ (NameId: sidSpider;
+ NameTex: nil;
+ Probability: 100;
+ NumberInCase: 1;
+ Ammo: (Propz: ammoprop_ForwMsgs or
+ ammoprop_NoCrosshair or
+ ammoprop_DontHold;
+ Count: 1;
+ NumPerTurn: 0;
+ Timer: 0;
+ Pos: 0;
+ AmmoType: amSpider);
+ Slot: 4;
+ TimeAfterTurn: 0;
+ minAngle: 0;
+ maxAngle: 0;
+ isDamaging: true;
+ SkipTurns: 0;
+ PosCount: 1;
PosSprite: sprWater)
);
--- a/hedgewars/uGears.pas Wed Jul 23 11:55:47 2008 +0000
+++ b/hedgewars/uGears.pas Fri Jul 25 10:56:05 2008 +0000
@@ -137,7 +137,8 @@
@doStepCase,
@doStepMortar,
@doStepWhip,
- @doStepKamikaze
+ @doStepKamikaze,
+ @doStepSpider
);
procedure InsertGearToList(Gear: PGear);
--- a/hedgewars/uLocale.pas Wed Jul 23 11:55:47 2008 +0000
+++ b/hedgewars/uLocale.pas Fri Jul 25 10:56:05 2008 +0000
@@ -23,7 +23,7 @@
sidDynamite, sidBaseballBat, sidFirePunch, sidSeconds,
sidParachute, sidAirAttack, sidMineStrike, sidBlowTorch,
sidGirder, sidTeleport, sidSwitch, sidMortar, sidWhip,
- sidKamikaze);
+ sidKamikaze, sidSpider);
TMsgStrId = (sidStartFight, sidDraw, sidWinner, sidVolume, sidPaused,
sidConfirm, sidSuddenDeath);
--- a/share/hedgewars/Data/Locale/bg.txt Wed Jul 23 11:55:47 2008 +0000
+++ b/share/hedgewars/Data/Locale/bg.txt Fri Jul 25 10:56:05 2008 +0000
@@ -24,6 +24,7 @@
00:21=Миномет
00:22=Бич
00:23=Камикадзе
+00:24=Spider
01:00=Бой!
01:01=Равен рунд
--- a/share/hedgewars/Data/Locale/de.txt Wed Jul 23 11:55:47 2008 +0000
+++ b/share/hedgewars/Data/Locale/de.txt Fri Jul 25 10:56:05 2008 +0000
@@ -24,6 +24,7 @@
00:21=Mörser
00:22=Stoßen
00:23=Kamikaze
+00:24=Spider
01:00=Auf in die Schlacht!
01:01=Unentschieden
--- a/share/hedgewars/Data/Locale/en.txt Wed Jul 23 11:55:47 2008 +0000
+++ b/share/hedgewars/Data/Locale/en.txt Fri Jul 25 10:56:05 2008 +0000
@@ -24,6 +24,7 @@
00:21=Mortar
00:22=Whip
00:23=Kamikaze
+00:24=Spider
01:00=Let's fight!
01:01=Round draw
--- a/share/hedgewars/Data/Locale/fr.txt Wed Jul 23 11:55:47 2008 +0000
+++ b/share/hedgewars/Data/Locale/fr.txt Fri Jul 25 10:56:05 2008 +0000
@@ -24,6 +24,7 @@
00:21=Mortier
00:22=Fouet
00:23=Kamikaze
+00:24=Spider
01:00=C'est parti!
01:01=Round ex aequo
--- a/share/hedgewars/Data/Locale/it.txt Wed Jul 23 11:55:47 2008 +0000
+++ b/share/hedgewars/Data/Locale/it.txt Fri Jul 25 10:56:05 2008 +0000
@@ -24,6 +24,7 @@
00:21=Granata a grappolo
00:22=Frusta
00:23=Attacco Kamikaze
+00:24=Spider
01:00=Combattiamo!
01:01=Round in parità
--- a/share/hedgewars/Data/Locale/pl.txt Wed Jul 23 11:55:47 2008 +0000
+++ b/share/hedgewars/Data/Locale/pl.txt Fri Jul 25 10:56:05 2008 +0000
@@ -24,6 +24,7 @@
00:21=Moździerz
00:22=Bicz
00:23=Kamikaze
+00:24=Spider
01:00=Walczmy!
01:01=Remis
--- a/share/hedgewars/Data/Locale/ru.txt Wed Jul 23 11:55:47 2008 +0000
+++ b/share/hedgewars/Data/Locale/ru.txt Fri Jul 25 10:56:05 2008 +0000
@@ -24,6 +24,7 @@
00:21=Миномёт
00:22=Кнут
00:23=Камикадзе
+00:24=Паук
01:00=Вперёд к победе!
01:01=Ничья
--- a/share/hedgewars/Data/Locale/sk.txt Wed Jul 23 11:55:47 2008 +0000
+++ b/share/hedgewars/Data/Locale/sk.txt Fri Jul 25 10:56:05 2008 +0000
@@ -24,6 +24,7 @@
00:21=Mínomet
00:22=Bič
00:23=Kamikadze
+00:24=Spider
01:00=Do boja!
01:01=Remíza