--- a/QTfrontend/ammoSchemeModel.cpp Mon Nov 08 23:58:22 2010 +0100
+++ b/QTfrontend/ammoSchemeModel.cpp Mon Nov 08 23:58:59 2010 +0100
@@ -416,7 +416,7 @@
<< QVariant(100) // damage modfier 22
<< QVariant(9999) // turn time 23
<< QVariant(100) // init health 24
- << QVariant(999) // sudden death 25
+ << QVariant(15) // sudden death 25
<< QVariant(5) // case prob 26
<< QVariant(3) // mines time 27
<< QVariant(5) // mines number 28
@@ -424,8 +424,8 @@
<< QVariant(2) // explosives 30
<< QVariant(35) // health case pct 31
<< QVariant(30) // health case amt 32
- << QVariant(47) // water rise amt 33
- << QVariant(5) // health dec amt 34
+ << QVariant(0) // water rise amt 33
+ << QVariant(0) // health dec amt 34
;
schemes.append(defaultScheme);
--- a/QTfrontend/hwconsts.cpp.in Mon Nov 08 23:58:22 2010 +0100
+++ b/QTfrontend/hwconsts.cpp.in Mon Nov 08 23:58:59 2010 +0100
@@ -80,13 +80,13 @@
QColor *colors[] = {
new QColor(221, 0, 0), // classic red
- new QColor( 67, 118, 233), // classic blue
+ new QColor( 51, 102, 217), // dark blue
new QColor( 62, 147, 33), // classic green
new QColor(162, 61, 187), // classic purple
new QColor(255, 147, 41), // classic orange
new QColor(115, 115, 115), // classic gray
- new QColor(187, 162, 61), // gold
- new QColor( 61, 162, 187), // cyan
+ new QColor(0, 255, 255), // cyan
+ new QColor(255, 136, 136), // peach
// add new colors here
0};
--- a/QTfrontend/pages.cpp Mon Nov 08 23:58:22 2010 +0100
+++ b/QTfrontend/pages.cpp Mon Nov 08 23:58:59 2010 +0100
@@ -1617,7 +1617,7 @@
l->setPixmap(QPixmap(":/res/iconSuddenDeath.png"));
glBSLayout->addWidget(l,3,1,1,1);
SB_SuddenDeath = new QSpinBox(gbBasicSettings);
- SB_SuddenDeath->setRange(0, 999);
+ SB_SuddenDeath->setRange(0, 50);
SB_SuddenDeath->setValue(15);
SB_SuddenDeath->setSingleStep(3);
glBSLayout->addWidget(SB_SuddenDeath,3,2,1,1);
--- a/hedgewars/uGears.pas Mon Nov 08 23:58:22 2010 +0100
+++ b/hedgewars/uGears.pas Mon Nov 08 23:58:59 2010 +0100
@@ -812,20 +812,23 @@
inc(step)
end;
stHealth: begin
- if (TotalRounds = cSuddenDTurns) and not SuddenDeathDmg and not isInMultiShoot then
+ if (cWaterRise <> 0) or (cHealthDecrease <> 0) then
begin
- SuddenDeathDmg:= true;
- AddCaption(trmsg[sidSuddenDeath], cWhiteColor, capgrpGameState);
- playSound(sndSuddenDeath)
- end
- else if (TotalRounds < cSuddenDTurns) and not isInMultiShoot then
- begin
- i:= cSuddenDTurns - TotalRounds;
- s:= inttostr(i);
- if i = 1 then
- AddCaption(trmsg[sidRoundSD], cWhiteColor, capgrpGameState)
- else if i in [2, 5, 10, 15, 20, 25, 50, 100] then
- AddCaption(Format(trmsg[sidRoundsSD], s), cWhiteColor, capgrpGameState);
+ if (TotalRounds = cSuddenDTurns) and not SuddenDeathDmg and not isInMultiShoot then
+ begin
+ SuddenDeathDmg:= true;
+ AddCaption(trmsg[sidSuddenDeath], cWhiteColor, capgrpGameState);
+ playSound(sndSuddenDeath)
+ end
+ else if (TotalRounds < cSuddenDTurns) and not isInMultiShoot then
+ begin
+ i:= cSuddenDTurns - TotalRounds;
+ s:= inttostr(i);
+ if i = 1 then
+ AddCaption(trmsg[sidRoundSD], cWhiteColor, capgrpGameState)
+ else if i in [2, 5, 10, 15, 20, 25, 50, 100] then
+ AddCaption(Format(trmsg[sidRoundsSD], s), cWhiteColor, capgrpGameState);
+ end;
end;
if bBetweenTurns
or isInMultiShoot
Binary file share/hedgewars/Data/Maps/FlightJoust/preview.png has changed