Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prepare for new weapon 'Kamikaze'
authorunc0rr
Mon, 09 Jun 2008 15:26:52 +0000
changeset 983 d21ad13cd17d
parent 982 bbf382a5fe73
child 984 dd5f16f69926
Prepare for new weapon 'Kamikaze'
QTfrontend/hwconsts.cpp.in file | annotate | diff | comparison | revisions
hedgewars/uAIAmmoTests.pas file | annotate | diff | comparison | revisions
hedgewars/uConsts.pas file | annotate | diff | comparison | revisions
hedgewars/uLocale.pas file | annotate | diff | comparison | revisions
share/hedgewars/Data/Locale/en.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Locale/pl.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Locale/ru.txt file | annotate | diff | comparison | revisions 
--- a/QTfrontend/hwconsts.cpp.in	Mon Jun 09 15:09:37 2008 +0000
+++ b/QTfrontend/hwconsts.cpp.in	Mon Jun 09 15:26:52 2008 +0000
@@ -28,7 +28,7 @@
 
 QStringList * Themes;
 
-QString * cDefaultAmmoStore = new QString("eammstore 9391929422199121033235");
+QString * cDefaultAmmoStore = new QString("eammstore 93919294221991210332351");
 
 QColor * color1 = new QColor(  0, 255, 255);
 QColor * color2 = new QColor(255, 127, 127);
--- a/hedgewars/uAIAmmoTests.pas	Mon Jun 09 15:09:37 2008 +0000
+++ b/hedgewars/uAIAmmoTests.pas	Mon Jun 09 15:26:52 2008 +0000
@@ -65,7 +65,8 @@
                   (proc: nil;              flags: 0), // amGirder
                   (proc: nil;              flags: amtest_OnTurn), // amTeleport
                   (proc: nil;              flags: 0), // amSwitch
-                  (proc: nil;              flags: 0)  // amMortar
+                  (proc: nil;              flags: 0), // amMortar
+                  (proc: nil;              flags: 0)  // amKamikaze
                   );
 
 const BadTurn = Low(LongInt) div 4;
--- a/hedgewars/uConsts.pas	Mon Jun 09 15:09:37 2008 +0000
+++ b/hedgewars/uConsts.pas	Mon Jun 09 15:26:52 2008 +0000
@@ -71,7 +71,7 @@
      TAmmoType  = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer,
                    amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch, amWhip,
                    amBaseballBat, amParachute, amAirAttack, amMineStrike, amBlowTorch,
-                   amGirder, amTeleport, amSwitch, amMortar);
+                   amGirder, amTeleport, amSwitch, amMortar, amKamikaze);
 
      THWFont    = (fnt16, fntBig, fntSmall);
 
@@ -189,7 +189,7 @@
       gmAllStoppable = gm_Left or gm_Right or gm_Up or gm_Down or gm_Attack;
 
       cMaxSlotIndex       = 8;
-      cMaxSlotAmmoIndex   = 2;
+      cMaxSlotAmmoIndex   = 3;
 
       ammoprop_Timerable    = $00000001;
       ammoprop_Power        = $00000002;
@@ -873,7 +873,7 @@
                                    Probability: 100;
                                    NumberInCase: 5;
                                    Ammo: (Propz: 0;
-                                          Count: 5;
+                                          Count: 4;
                                           NumPerTurn: 0;
                                           Timer: 0;
                                           Pos: 0;
@@ -885,6 +885,24 @@
                                    isDamaging: true;
                                    SkipTurns: 0;
                                    PosCount: 1;
+                                   PosSprite: sprWater),
+                                  (NameId: sidKamikaze;
+                                   NameTex: nil;
+                                   Probability: 100;
+                                   NumberInCase: 1;
+                                   Ammo: (Propz: 0;
+                                          Count: 1;
+                                          NumPerTurn: 0;
+                                          Timer: 0;
+                                          Pos: 0;
+                                          AmmoType: amKamikaze);
+                                   Slot: 3;
+                                   TimeAfterTurn: 0;
+                                   minAngle: 0;
+                                   maxAngle: 0;
+                                   isDamaging: true;
+                                   SkipTurns: 0;
+                                   PosCount: 1;
                                    PosSprite: sprWater)
                                   );
 
--- a/hedgewars/uLocale.pas	Mon Jun 09 15:09:37 2008 +0000
+++ b/hedgewars/uLocale.pas	Mon Jun 09 15:26:52 2008 +0000
@@ -22,7 +22,8 @@
                    sidPickHammer, sidSkip, sidRope, sidMine, sidDEagle,
                    sidDynamite, sidBaseballBat, sidFirePunch, sidSeconds,
                    sidParachute, sidAirAttack, sidMineStrike, sidBlowTorch,
-                   sidGirder, sidTeleport, sidSwitch, sidMortar, sidWhip);
+                   sidGirder, sidTeleport, sidSwitch, sidMortar, sidWhip,
+                   sidKamikaze);
 
      TMsgStrId = (sidStartFight, sidDraw, sidWinner, sidVolume, sidPaused);
 
--- a/share/hedgewars/Data/Locale/en.txt	Mon Jun 09 15:09:37 2008 +0000
+++ b/share/hedgewars/Data/Locale/en.txt	Mon Jun 09 15:26:52 2008 +0000
@@ -23,6 +23,7 @@
 00:20=Switch Hedgehog
 00:21=Mortar
 00:22=Whip
+00:23=Kamikaze
 
 01:00=Let's fight!
 01:01=Round draw
--- a/share/hedgewars/Data/Locale/pl.txt	Mon Jun 09 15:09:37 2008 +0000
+++ b/share/hedgewars/Data/Locale/pl.txt	Mon Jun 09 15:26:52 2008 +0000
@@ -23,6 +23,7 @@
 00:20=Zmień jeża
 00:21=Moździerz
 00:22=Bicz
+00:23=Kamikaze
 
 01:00=Walczmy!
 01:01=Remis
--- a/share/hedgewars/Data/Locale/ru.txt	Mon Jun 09 15:09:37 2008 +0000
+++ b/share/hedgewars/Data/Locale/ru.txt	Mon Jun 09 15:26:52 2008 +0000
@@ -23,6 +23,7 @@
 00:20=Переключить ежа
 00:21=Миномёт
 00:22=Кнут
+00:23=Камикадзе
 
 01:00=Вперёд к победе!
 01:01=Ничья
hedgewars