# HG changeset patch
# User unc0rr
# Date 1218885754 0
# Node ID 51e3f3cfdca5e23a32009a5476409b712bee594d
# Parent ebb643caeb34014d23b921a2e1f8224d4f55b5f2
Start seduction weapon implementation
diff -r ebb643caeb34 -r 51e3f3cfdca5 QTfrontend/hwconsts.cpp.in
--- a/QTfrontend/hwconsts.cpp.in Fri Aug 15 19:30:02 2008 +0000
+++ b/QTfrontend/hwconsts.cpp.in Sat Aug 16 11:22:34 2008 +0000
@@ -29,7 +29,7 @@
QStringList * Themes;
QStringList * mapList;
-QString * cDefaultAmmoStore = new QString("eammstore 939192942219912103223511");
+QString * cDefaultAmmoStore = new QString("eammstore 9391929422199121032235111");
QColor * color1 = new QColor( 0, 255, 255);
QColor * color2 = new QColor(255, 127, 127);
diff -r ebb643caeb34 -r 51e3f3cfdca5 hedgewars.kdevelop
--- a/hedgewars.kdevelop Fri Aug 15 19:30:02 2008 +0000
+++ b/hedgewars.kdevelop Sat Aug 16 11:22:34 2008 +0000
@@ -19,9 +19,9 @@
<projectname>hedgewars</projectname>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
- <description></description>
+ <description/>
<versioncontrol>kdevsubversion</versioncontrol>
- <defaultencoding></defaultencoding>
+ <defaultencoding/>
</general>
<kdevcustomproject>
<run>
@@ -32,7 +32,7 @@
<terminal>false</terminal>
<autocompile>true</autocompile>
<envvars/>
- <globaldebugarguments></globaldebugarguments>
+ <globaldebugarguments/>
<globalcwd>/usr/home/unC0Rr/Sources/Hedgewars/Hedgewars-FF/trunk</globalcwd>
<useglobalprogram>false</useglobalprogram>
<autoinstall>false</autoinstall>
@@ -55,16 +55,16 @@
</general>
<build>
<buildtool>make</buildtool>
- <builddir></builddir>
+ <builddir/>
</build>
<make>
<abortonerror>true</abortonerror>
<numberofjobs>4</numberofjobs>
<prio>0</prio>
<dontact>false</dontact>
- <makebin></makebin>
- <defaulttarget></defaulttarget>
- <makeoptions></makeoptions>
+ <makebin/>
+ <defaulttarget/>
+ <makeoptions/>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@@ -72,9 +72,9 @@
</make>
<other>
<prio>0</prio>
- <otherbin></otherbin>
- <defaulttarget></defaulttarget>
- <otheroptions></otheroptions>
+ <otherbin/>
+ <defaulttarget/>
+ <otheroptions/>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@@ -83,12 +83,12 @@
</kdevcustomproject>
<kdevdebugger>
<general>
- <dbgshell></dbgshell>
+ <dbgshell/>
<programargs/>
- <gdbpath></gdbpath>
- <configGdbScript></configGdbScript>
- <runShellScript></runShellScript>
- <runGdbScript></runGdbScript>
+ <gdbpath/>
+ <configGdbScript/>
+ <runShellScript/>
+ <runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
@@ -194,7 +194,7 @@
<includeTypedefs>false</includeTypedefs>
</codecompletion>
<creategettersetter>
- <prefixGet></prefixGet>
+ <prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
diff -r ebb643caeb34 -r 51e3f3cfdca5 hedgewars/uAIAmmoTests.pas
--- a/hedgewars/uAIAmmoTests.pas Fri Aug 15 19:30:02 2008 +0000
+++ b/hedgewars/uAIAmmoTests.pas Sat Aug 16 11:22:34 2008 +0000
@@ -68,7 +68,8 @@
(proc: nil; flags: 0), // amSwitch
(proc: @TestMortar; flags: 0), // amMortar
(proc: nil; flags: 0), // amKamikaze
- (proc: nil; flags: 0) // amCake
+ (proc: nil; flags: 0), // amCake
+ (proc: nil; flags: 0) // amSeduction
);
const BadTurn = Low(LongInt) div 4;
diff -r ebb643caeb34 -r 51e3f3cfdca5 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas Fri Aug 15 19:30:02 2008 +0000
+++ b/hedgewars/uConsts.pas Sat Aug 16 11:22:34 2008 +0000
@@ -74,7 +74,8 @@
TAmmoType = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer,
amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch, amWhip,
amBaseballBat, amParachute, amAirAttack, amMineStrike, amBlowTorch,
- amGirder, amTeleport, amSwitch, amMortar, amKamikaze, amCake);
+ amGirder, amTeleport, amSwitch, amMortar, amKamikaze, amCake,
+ amSeduction);
THWFont = (fnt16, fntBig, fntSmall);
@@ -971,6 +972,26 @@
isDamaging: true;
SkipTurns: 0;
PosCount: 1;
+ PosSprite: sprWater),
+ (NameId: sidSeduction;
+ 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: amSeduction);
+ Slot: 2;
+ TimeAfterTurn: 0;
+ minAngle: 0;
+ maxAngle: 0;
+ isDamaging: true;
+ SkipTurns: 0;
+ PosCount: 1;
PosSprite: sprWater)
);
diff -r ebb643caeb34 -r 51e3f3cfdca5 hedgewars/uGears.pas
--- a/hedgewars/uGears.pas Fri Aug 15 19:30:02 2008 +0000
+++ b/hedgewars/uGears.pas Sat Aug 16 11:22:34 2008 +0000
@@ -785,15 +785,17 @@
1,
5,
0);
- amWhip: begin
- DrawRotatedF(sprWhip,
+ amWhip: DrawRotatedF(sprWhip,
hwRound(Gear^.X) + 1 + WorldDx,
hwRound(Gear^.Y) - 3 + WorldDy,
0,
hwSign(Gear^.dX),
0);
- defaultPos:= false
- end;
+ amSeduction: DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
+ hwSign(Gear^.dX),
+ 2,
+ 2,
+ 0);
else
DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
hwSign(Gear^.dX),
diff -r ebb643caeb34 -r 51e3f3cfdca5 hedgewars/uLocale.pas
--- a/hedgewars/uLocale.pas Fri Aug 15 19:30:02 2008 +0000
+++ b/hedgewars/uLocale.pas Sat Aug 16 11:22:34 2008 +0000
@@ -23,7 +23,7 @@
sidDynamite, sidBaseballBat, sidFirePunch, sidSeconds,
sidParachute, sidAirAttack, sidMineStrike, sidBlowTorch,
sidGirder, sidTeleport, sidSwitch, sidMortar, sidWhip,
- sidKamikaze, sidCake);
+ sidKamikaze, sidCake, sidSeduction);
TMsgStrId = (sidStartFight, sidDraw, sidWinner, sidVolume, sidPaused,
sidConfirm, sidSuddenDeath);
diff -r ebb643caeb34 -r 51e3f3cfdca5 share/hedgewars/Data/Graphics/Hedgehog.png
Binary file share/hedgewars/Data/Graphics/Hedgehog.png has changed
diff -r ebb643caeb34 -r 51e3f3cfdca5 share/hedgewars/Data/Locale/bg.txt
--- a/share/hedgewars/Data/Locale/bg.txt Fri Aug 15 19:30:02 2008 +0000
+++ b/share/hedgewars/Data/Locale/bg.txt Sat Aug 16 11:22:34 2008 +0000
@@ -25,6 +25,7 @@
00:22=Бич
00:23=Камикадзе
00:24=Cake
+00:25=Seduction
01:00=Бой!
01:01=Равен рунд
diff -r ebb643caeb34 -r 51e3f3cfdca5 share/hedgewars/Data/Locale/de.txt
--- a/share/hedgewars/Data/Locale/de.txt Fri Aug 15 19:30:02 2008 +0000
+++ b/share/hedgewars/Data/Locale/de.txt Sat Aug 16 11:22:34 2008 +0000
@@ -25,6 +25,7 @@
00:22=Stoßen
00:23=Kamikaze
00:24=Cake
+00:25=Seduction
01:00=Auf in die Schlacht!
01:01=Unentschieden
diff -r ebb643caeb34 -r 51e3f3cfdca5 share/hedgewars/Data/Locale/en.txt
--- a/share/hedgewars/Data/Locale/en.txt Fri Aug 15 19:30:02 2008 +0000
+++ b/share/hedgewars/Data/Locale/en.txt Sat Aug 16 11:22:34 2008 +0000
@@ -25,6 +25,7 @@
00:22=Whip
00:23=Kamikaze
00:24=Cake
+00:25=Seduction
01:00=Let's fight!
01:01=Round draw
diff -r ebb643caeb34 -r 51e3f3cfdca5 share/hedgewars/Data/Locale/fr.txt
--- a/share/hedgewars/Data/Locale/fr.txt Fri Aug 15 19:30:02 2008 +0000
+++ b/share/hedgewars/Data/Locale/fr.txt Sat Aug 16 11:22:34 2008 +0000
@@ -25,6 +25,7 @@
00:22=Fouet
00:23=Kamikaze
00:24=Gateau
+00:25=Seduction
01:00=C'est parti!
01:01=Round ex aequo
diff -r ebb643caeb34 -r 51e3f3cfdca5 share/hedgewars/Data/Locale/it.txt
--- a/share/hedgewars/Data/Locale/it.txt Fri Aug 15 19:30:02 2008 +0000
+++ b/share/hedgewars/Data/Locale/it.txt Sat Aug 16 11:22:34 2008 +0000
@@ -25,6 +25,7 @@
00:22=Frusta
00:23=Attacco Kamikaze
00:24=Torta
+00:25=Seduction
01:00=Combattiamo!
01:01=Round in parità
diff -r ebb643caeb34 -r 51e3f3cfdca5 share/hedgewars/Data/Locale/pl.txt
--- a/share/hedgewars/Data/Locale/pl.txt Fri Aug 15 19:30:02 2008 +0000
+++ b/share/hedgewars/Data/Locale/pl.txt Sat Aug 16 11:22:34 2008 +0000
@@ -25,6 +25,7 @@
00:22=Bicz
00:23=Kamikaze
00:24=Ciasto
+00:25=Seduction
01:00=Walczmy!
01:01=Remis
diff -r ebb643caeb34 -r 51e3f3cfdca5 share/hedgewars/Data/Locale/ru.txt
--- a/share/hedgewars/Data/Locale/ru.txt Fri Aug 15 19:30:02 2008 +0000
+++ b/share/hedgewars/Data/Locale/ru.txt Sat Aug 16 11:22:34 2008 +0000
@@ -25,6 +25,7 @@
00:22=Кнут
00:23=Камикадзе
00:24=Торт
+00:25=Соблазнение
01:00=Вперёд к победе!
01:01=Ничья
diff -r ebb643caeb34 -r 51e3f3cfdca5 share/hedgewars/Data/Locale/sk.txt
--- a/share/hedgewars/Data/Locale/sk.txt Fri Aug 15 19:30:02 2008 +0000
+++ b/share/hedgewars/Data/Locale/sk.txt Sat Aug 16 11:22:34 2008 +0000
@@ -24,6 +24,8 @@
00:21=Mínomet
00:22=Bič
00:23=Kamikadze
+00:24=Cake
+00:25=Seduction
01:00=Do boja!
01:01=Remíza
diff -r ebb643caeb34 -r 51e3f3cfdca5 share/hedgewars/Data/Locale/sv.txt
--- a/share/hedgewars/Data/Locale/sv.txt Fri Aug 15 19:30:02 2008 +0000
+++ b/share/hedgewars/Data/Locale/sv.txt Sat Aug 16 11:22:34 2008 +0000
@@ -25,6 +25,7 @@
00:22=Piska
00:23=Kamikaze (självmord)
00:24=Tårta
+00:25=Seduction
01:00=Nu kör vi!
01:01=Oavgjort