# HG changeset patch # User nemo # Date 1289627268 18000 # Node ID 9057d4d85830d7ef526960ad0bd46763f8dd6162 # Parent 4866cc130b8d493592dc3897395eb833b63a2fdc check in frontend flag for more wind mode diff -r 4866cc130b8d -r 9057d4d85830 QTfrontend/ammoSchemeModel.cpp --- a/QTfrontend/ammoSchemeModel.cpp Fri Nov 12 23:29:11 2010 -0500 +++ b/QTfrontend/ammoSchemeModel.cpp Sat Nov 13 00:47:48 2010 -0500 @@ -46,19 +46,20 @@ << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 << QVariant(false) // no wind 22 - << QVariant(100) // damage modfier 23 - << QVariant(45) // turn time 24 - << QVariant(100) // init health 25 - << QVariant(15) // sudden death 26 - << QVariant(5) // case prob 27 - << QVariant(3) // mines time 28 - << QVariant(4) // mines number 29 - << QVariant(0) // mine dud pct 30 - << QVariant(2) // explosives 31 - << QVariant(35) // health case pct 32 - << QVariant(25) // health case amt 33 - << QVariant(47) // water rise amt 34 - << QVariant(5) // health dec amt 35 + << QVariant(false) // more wind 23 + << QVariant(100) // damage modfier 24 + << QVariant(45) // turn time 25 + << QVariant(100) // init health 26 + << QVariant(15) // sudden death 27 + << QVariant(5) // case prob 28 + << QVariant(3) // mines time 29 + << QVariant(4) // mines number 30 + << QVariant(0) // mine dud pct 31 + << QVariant(2) // explosives 32 + << QVariant(35) // health case pct 33 + << QVariant(25) // health case amt 34 + << QVariant(47) // water rise amt 35 + << QVariant(5) // health dec amt 36 ; AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) : @@ -105,19 +106,20 @@ << "resetweps" // 20 << "perhogammo" // 21 << "disablewind" // 22 - << "damagefactor" // 22 - << "turntime" // 23 - << "health" // 24 - << "suddendeath" // 25 - << "caseprobability" // 26 - << "minestime" // 27 - << "minesnum" // 28 - << "minedudpct" // 29 - << "explosives" // 30 - << "healthprobability" // 31 - << "healthcaseamount" // 32 - << "waterrise" // 33 - << "healthdecrease" // 34 + << "morewind" // 23 + << "damagefactor" // 24 + << "turntime" // 25 + << "health" // 26 + << "suddendeath" // 27 + << "caseprobability" // 28 + << "minestime" // 29 + << "minesnum" // 30 + << "minedudpct" // 31 + << "explosives" // 32 + << "healthprobability" // 33 + << "healthcaseamount" // 34 + << "waterrise" // 35 + << "healthdecrease" // 36 ; QList proMode; @@ -145,19 +147,20 @@ << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 << QVariant(false) // no wind 22 - << QVariant(100) // damage modfier 23 - << QVariant(15) // turn time 24 - << QVariant(100) // init health 25 - << QVariant(15) // sudden death 26 - << QVariant(0) // case prob 27 - << QVariant(3) // mines time 28 - << QVariant(0) // mines number 29 - << QVariant(0) // mine dud pct 30 - << QVariant(2) // explosives 31 - << QVariant(35) // health case pct 32 - << QVariant(25) // health case amt 33 - << QVariant(47) // water rise amt 34 - << QVariant(5) // health dec amt 35 + << QVariant(false) // more wind 23 + << QVariant(100) // damage modfier 24 + << QVariant(15) // turn time 25 + << QVariant(100) // init health 26 + << QVariant(15) // sudden death 27 + << QVariant(0) // case prob 28 + << QVariant(3) // mines time 29 + << QVariant(0) // mines number 30 + << QVariant(0) // mine dud pct 31 + << QVariant(2) // explosives 32 + << QVariant(35) // health case pct 33 + << QVariant(25) // health case amt 34 + << QVariant(47) // water rise amt 35 + << QVariant(5) // health dec amt 36 ; QList shoppa; @@ -185,19 +188,20 @@ << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 << QVariant(false) // no wind 22 - << QVariant(100) // damage modfier 23 - << QVariant(30) // turn time 24 - << QVariant(100) // init health 25 - << QVariant(50) // sudden death 26 - << QVariant(1) // case prob 27 - << QVariant(3) // mines time 28 - << QVariant(0) // mines number 29 - << QVariant(0) // mine dud pct 30 - << QVariant(0) // explosives 31 - << QVariant(0) // health case pct 32 - << QVariant(25) // health case amt 33 - << QVariant(47) // water rise amt 34 - << QVariant(5) // health dec amt 35 + << QVariant(false) // more wind 23 + << QVariant(100) // damage modfier 24 + << QVariant(30) // turn time 25 + << QVariant(100) // init health 26 + << QVariant(50) // sudden death 27 + << QVariant(1) // case prob 28 + << QVariant(3) // mines time 29 + << QVariant(0) // mines number 30 + << QVariant(0) // mine dud pct 31 + << QVariant(0) // explosives 32 + << QVariant(0) // health case pct 33 + << QVariant(25) // health case amt 34 + << QVariant(47) // water rise amt 35 + << QVariant(5) // health dec amt 36 ; QList cleanslate; @@ -225,19 +229,20 @@ << QVariant(true) // reset weps 20 << QVariant(false) // per hog ammo 21 << QVariant(false) // no wind 22 - << QVariant(100) // damage modfier 23 - << QVariant(45) // turn time 24 - << QVariant(100) // init health 25 - << QVariant(15) // sudden death 26 - << QVariant(5) // case prob 27 - << QVariant(3) // mines time 28 - << QVariant(4) // mines number 29 - << QVariant(0) // mine dud pct 30 - << QVariant(2) // explosives 31 - << QVariant(35) // health case pct 32 - << QVariant(25) // health case amt 33 - << QVariant(47) // water rise amt 34 - << QVariant(5) // health dec amt 35 + << QVariant(false) // more wind 23 + << QVariant(100) // damage modfier 24 + << QVariant(45) // turn time 25 + << QVariant(100) // init health 26 + << QVariant(15) // sudden death 27 + << QVariant(5) // case prob 28 + << QVariant(3) // mines time 29 + << QVariant(4) // mines number 30 + << QVariant(0) // mine dud pct 31 + << QVariant(2) // explosives 32 + << QVariant(35) // health case pct 33 + << QVariant(25) // health case amt 34 + << QVariant(47) // water rise amt 35 + << QVariant(5) // health dec amt 36 ; QList minefield; @@ -265,19 +270,20 @@ << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 << QVariant(false) // no wind 22 - << QVariant(150) // damage modfier 23 - << QVariant(30) // turn time 24 - << QVariant(50) // init health 25 - << QVariant(15) // sudden death 26 - << QVariant(0) // case prob 27 - << QVariant(0) // mines time 28 - << QVariant(80) // mines number 29 - << QVariant(0) // mine dud pct 30 - << QVariant(0) // explosives 31 - << QVariant(35) // health case pct 32 - << QVariant(25) // health case amt 33 - << QVariant(47) // water rise amt 34 - << QVariant(5) // health dec amt 35 + << QVariant(false) // more wind 23 + << QVariant(150) // damage modfier 24 + << QVariant(30) // turn time 25 + << QVariant(50) // init health 26 + << QVariant(15) // sudden death 27 + << QVariant(0) // case prob 28 + << QVariant(0) // mines time 29 + << QVariant(80) // mines number 30 + << QVariant(0) // mine dud pct 31 + << QVariant(0) // explosives 32 + << QVariant(35) // health case pct 33 + << QVariant(25) // health case amt 34 + << QVariant(47) // water rise amt 35 + << QVariant(5) // health dec amt 36 ; QList barrelmayhem; @@ -305,19 +311,20 @@ << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 << QVariant(false) // no wind 22 - << QVariant(100) // damage modfier 23 - << QVariant(30) // turn time 24 - << QVariant(100) // init health 25 - << QVariant(15) // sudden death 26 - << QVariant(0) // case prob 27 - << QVariant(0) // mines time 28 - << QVariant(0) // mines number 29 - << QVariant(0) // mine dud pct 30 - << QVariant(80) // explosives 31 - << QVariant(35) // health case pct 32 - << QVariant(25) // health case amt 33 - << QVariant(47) // water rise amt 34 - << QVariant(5) // health dec amt 35 + << QVariant(false) // more wind 23 + << QVariant(100) // damage modfier 24 + << QVariant(30) // turn time 25 + << QVariant(100) // init health 26 + << QVariant(15) // sudden death 27 + << QVariant(0) // case prob 28 + << QVariant(0) // mines time 29 + << QVariant(0) // mines number 30 + << QVariant(0) // mine dud pct 31 + << QVariant(80) // explosives 32 + << QVariant(35) // health case pct 33 + << QVariant(25) // health case amt 34 + << QVariant(47) // water rise amt 35 + << QVariant(5) // health dec amt 36 ; QList tunnelhogs; @@ -345,19 +352,20 @@ << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 << QVariant(false) // no wind 22 - << QVariant(100) // damage modfier 23 - << QVariant(30) // turn time 24 - << QVariant(100) // init health 25 - << QVariant(15) // sudden death 26 - << QVariant(5) // case prob 27 - << QVariant(3) // mines time 28 - << QVariant(10) // mines number 29 - << QVariant(10) // mine dud pct 30 - << QVariant(10) // explosives 31 - << QVariant(35) // health case pct 32 - << QVariant(25) // health case amt 33 - << QVariant(47) // water rise amt 34 - << QVariant(5) // health dec amt 35 + << QVariant(false) // more wind 23 + << QVariant(100) // damage modfier 24 + << QVariant(30) // turn time 25 + << QVariant(100) // init health 26 + << QVariant(15) // sudden death 27 + << QVariant(5) // case prob 28 + << QVariant(3) // mines time 29 + << QVariant(10) // mines number 30 + << QVariant(10) // mine dud pct 31 + << QVariant(10) // explosives 32 + << QVariant(35) // health case pct 33 + << QVariant(25) // health case amt 34 + << QVariant(47) // water rise amt 35 + << QVariant(5) // health dec amt 36 ; QList forts; @@ -385,19 +393,20 @@ << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 << QVariant(false) // no wind 22 - << QVariant(100) // damage modfier 23 - << QVariant(45) // turn time 24 - << QVariant(100) // init health 25 - << QVariant(15) // sudden death 26 - << QVariant(5) // case prob 27 - << QVariant(3) // mines time 28 - << QVariant(0) // mines number 29 - << QVariant(0) // mine dud pct 30 - << QVariant(0) // explosives 31 - << QVariant(35) // health case pct 32 - << QVariant(25) // health case amt 33 - << QVariant(47) // water rise amt 34 - << QVariant(5) // health dec amt 35 + << QVariant(false) // more wind 23 + << QVariant(100) // damage modfier 24 + << QVariant(45) // turn time 25 + << QVariant(100) // init health 26 + << QVariant(15) // sudden death 27 + << QVariant(5) // case prob 28 + << QVariant(3) // mines time 29 + << QVariant(0) // mines number 30 + << QVariant(0) // mine dud pct 31 + << QVariant(0) // explosives 32 + << QVariant(35) // health case pct 33 + << QVariant(25) // health case amt 34 + << QVariant(47) // water rise amt 35 + << QVariant(5) // health dec amt 36 ; QList timeless; @@ -425,19 +434,20 @@ << QVariant(false) // reset weps 20 << QVariant(true) // per hog ammo 21 << QVariant(false) // no wind 22 - << QVariant(100) // damage modfier 23 - << QVariant(9999) // turn time 24 - << QVariant(100) // init health 25 - << QVariant(15) // sudden death 26 - << QVariant(5) // case prob 27 - << QVariant(3) // mines time 28 - << QVariant(5) // mines number 29 - << QVariant(10) // mine dud pct 30 - << QVariant(2) // explosives 31 - << QVariant(35) // health case pct 32 - << QVariant(30) // health case amt 33 - << QVariant(0) // water rise amt 34 - << QVariant(0) // health dec amt 35 + << QVariant(false) // more wind 23 + << QVariant(100) // damage modfier 24 + << QVariant(9999) // turn time 25 + << QVariant(100) // init health 26 + << QVariant(15) // sudden death 27 + << QVariant(5) // case prob 28 + << QVariant(3) // mines time 29 + << QVariant(5) // mines number 30 + << QVariant(10) // mine dud pct 31 + << QVariant(2) // explosives 32 + << QVariant(35) // health case pct 33 + << QVariant(30) // health case amt 34 + << QVariant(0) // water rise amt 35 + << QVariant(0) // health dec amt 36 ; QList thinkingportals; @@ -465,19 +475,20 @@ << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 << QVariant(false) // no wind 22 - << QVariant(100) // damage modfier 23 - << QVariant(45) // turn time 24 - << QVariant(100) // init health 25 - << QVariant(15) // sudden death 26 - << QVariant(2) // case prob 27 - << QVariant(3) // mines time 28 - << QVariant(5) // mines number 29 - << QVariant(0) // mine dud pct 30 - << QVariant(5) // explosives 31 - << QVariant(25) // health case pct 32 - << QVariant(25) // health case amt 33 - << QVariant(47) // water rise amt 34 - << QVariant(5) // health dec amt 35 + << QVariant(false) // more wind 23 + << QVariant(100) // damage modfier 24 + << QVariant(45) // turn time 25 + << QVariant(100) // init health 26 + << QVariant(15) // sudden death 27 + << QVariant(2) // case prob 28 + << QVariant(3) // mines time 29 + << QVariant(5) // mines number 30 + << QVariant(0) // mine dud pct 31 + << QVariant(5) // explosives 32 + << QVariant(25) // health case pct 33 + << QVariant(25) // health case amt 34 + << QVariant(47) // water rise amt 35 + << QVariant(5) // health dec amt 36 ; QList kingmode; @@ -505,19 +516,20 @@ << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 << QVariant(false) // no wind 22 - << QVariant(100) // damage modfier 23 - << QVariant(45) // turn time 24 - << QVariant(100) // init health 25 - << QVariant(15) // sudden death 26 - << QVariant(5) // case prob 27 - << QVariant(3) // mines time 28 - << QVariant(3) // mines number 29 - << QVariant(20) // mine dud pct 30 - << QVariant(3) // explosives 31 - << QVariant(35) // health case pct 32 - << QVariant(30) // health case amt 33 - << QVariant(30) // water rise amt 34 - << QVariant(5) // health dec amt 35 + << QVariant(false) // more wind 23 + << QVariant(100) // damage modfier 24 + << QVariant(45) // turn time 25 + << QVariant(100) // init health 26 + << QVariant(15) // sudden death 27 + << QVariant(5) // case prob 28 + << QVariant(3) // mines time 29 + << QVariant(3) // mines number 30 + << QVariant(20) // mine dud pct 31 + << QVariant(3) // explosives 32 + << QVariant(35) // health case pct 33 + << QVariant(30) // health case amt 34 + << QVariant(30) // water rise amt 35 + << QVariant(5) // health dec amt 36 ; diff -r 4866cc130b8d -r 9057d4d85830 QTfrontend/gamecfgwidget.cpp --- a/QTfrontend/gamecfgwidget.cpp Fri Nov 12 23:29:11 2010 -0500 +++ b/QTfrontend/gamecfgwidget.cpp Sat Nov 13 00:47:48 2010 -0500 @@ -151,13 +151,15 @@ result |= 0x00400000; // per hog ammo if (schemeData(22).toBool()) result |= 0x00800000; // no wind + if (schemeData(23).toBool()) + result |= 0x01000000; // more wind return result; } quint32 GameCFGWidget::getInitHealth() const { - return schemeData(25).toInt(); + return schemeData(26).toInt(); } QStringList GameCFGWidget::getFullConfig() const @@ -165,18 +167,18 @@ QStringList sl; sl.append("eseed " + pMapContainer->getCurrentSeed()); sl.append(QString("e$gmflags %1").arg(getGameFlags())); - sl.append(QString("e$damagepct %1").arg(schemeData(23).toInt())); - sl.append(QString("e$turntime %1").arg(schemeData(24).toInt() * 1000)); - sl.append(QString("e$sd_turns %1").arg(schemeData(26).toInt())); - sl.append(QString("e$casefreq %1").arg(schemeData(27).toInt())); - sl.append(QString("e$minestime %1").arg(schemeData(28).toInt())); - sl.append(QString("e$minesnum %1").arg(schemeData(29).toInt())); - sl.append(QString("e$minedudpct %1").arg(schemeData(30).toInt())); - sl.append(QString("e$explosives %1").arg(schemeData(31).toInt())); - sl.append(QString("e$healthprob %1").arg(schemeData(32).toInt())); - sl.append(QString("e$hcaseamount %1").arg(schemeData(33).toInt())); - sl.append(QString("e$waterrise %1").arg(schemeData(34).toInt())); - sl.append(QString("e$healthdec %1").arg(schemeData(35).toInt())); + sl.append(QString("e$damagepct %1").arg(schemeData(24).toInt())); + sl.append(QString("e$turntime %1").arg(schemeData(25).toInt() * 1000)); + sl.append(QString("e$sd_turns %1").arg(schemeData(27).toInt())); + sl.append(QString("e$casefreq %1").arg(schemeData(28).toInt())); + sl.append(QString("e$minestime %1").arg(schemeData(29).toInt())); + sl.append(QString("e$minesnum %1").arg(schemeData(30).toInt())); + sl.append(QString("e$minedudpct %1").arg(schemeData(31).toInt())); + sl.append(QString("e$explosives %1").arg(schemeData(32).toInt())); + sl.append(QString("e$healthprob %1").arg(schemeData(33).toInt())); + sl.append(QString("e$hcaseamount %1").arg(schemeData(34).toInt())); + sl.append(QString("e$waterrise %1").arg(schemeData(35).toInt())); + sl.append(QString("e$healthdec %1").arg(schemeData(36).toInt())); sl.append(QString("e$template_filter %1").arg(pMapContainer->getTemplateFilter())); sl.append(QString("e$mapgen %1").arg(pMapContainer->get_mapgen())); sl.append(QString("e$maze_size %1").arg(pMapContainer->get_maze_size())); diff -r 4866cc130b8d -r 9057d4d85830 QTfrontend/hedgewars.qrc --- a/QTfrontend/hedgewars.qrc Fri Nov 12 23:29:11 2010 -0500 +++ b/QTfrontend/hedgewars.qrc Sat Nov 13 00:47:48 2010 -0500 @@ -72,6 +72,7 @@ res/btnResetWeps.png res/btnPerHogAmmo.png res/btnNoWind.png + res/btnMoreWind.png res/iconBox.png res/iconHealth.png res/iconSuddenDeath.png diff -r 4866cc130b8d -r 9057d4d85830 QTfrontend/pages.cpp --- a/QTfrontend/pages.cpp Fri Nov 12 23:29:11 2010 -0500 +++ b/QTfrontend/pages.cpp Sat Nov 13 00:47:48 2010 -0500 @@ -1566,6 +1566,10 @@ TBW_nowind->setToolTip("" + ToggleButtonWidget::tr("Disable Wind") + ":
" + tr("Wind will not affect weapons.")); glGMLayout->addWidget(TBW_nowind,4,1,1,1); + TBW_morewind = new ToggleButtonWidget(gbGameModes, ":/res/btnMoreWind.png"); + TBW_morewind->setToolTip("" + ToggleButtonWidget::tr("More Wind") + ":
" + tr("Wind will affect almost everything.")); + glGMLayout->addWidget(TBW_morewind,4,2,1,1); + // Right QLabel * l; @@ -1805,19 +1809,20 @@ mapper->addMapping(TBW_resetweps, 20); mapper->addMapping(TBW_perhogammo, 21); mapper->addMapping(TBW_nowind, 22); - mapper->addMapping(SB_DamageModifier, 23); - mapper->addMapping(SB_TurnTime, 24); - mapper->addMapping(SB_InitHealth, 25); - mapper->addMapping(SB_SuddenDeath, 26); - mapper->addMapping(SB_CaseProb, 27); - mapper->addMapping(SB_MinesTime, 28); - mapper->addMapping(SB_Mines, 29); - mapper->addMapping(SB_MineDuds, 30); - mapper->addMapping(SB_Explosives, 31); - mapper->addMapping(SB_HealthCrates, 32); - mapper->addMapping(SB_CrateHealth, 33); - mapper->addMapping(SB_WaterRise, 34); - mapper->addMapping(SB_HealthDecrease, 35); + mapper->addMapping(TBW_morewind, 23); + mapper->addMapping(SB_DamageModifier, 24); + mapper->addMapping(SB_TurnTime, 25); + mapper->addMapping(SB_InitHealth, 26); + mapper->addMapping(SB_SuddenDeath, 27); + mapper->addMapping(SB_CaseProb, 28); + mapper->addMapping(SB_MinesTime, 29); + mapper->addMapping(SB_Mines, 30); + mapper->addMapping(SB_MineDuds, 31); + mapper->addMapping(SB_Explosives, 32); + mapper->addMapping(SB_HealthCrates, 33); + mapper->addMapping(SB_CrateHealth, 34); + mapper->addMapping(SB_WaterRise, 35); + mapper->addMapping(SB_HealthDecrease, 36); mapper->toFirst(); } diff -r 4866cc130b8d -r 9057d4d85830 QTfrontend/pages.h --- a/QTfrontend/pages.h Fri Nov 12 23:29:11 2010 -0500 +++ b/QTfrontend/pages.h Sat Nov 13 00:47:48 2010 -0500 @@ -482,6 +482,7 @@ ToggleButtonWidget * TBW_resetweps; ToggleButtonWidget * TBW_perhogammo; ToggleButtonWidget * TBW_nowind; + ToggleButtonWidget * TBW_morewind; QSpinBox * SB_DamageModifier; QSpinBox * SB_TurnTime; diff -r 4866cc130b8d -r 9057d4d85830 QTfrontend/res/btnMoreWind.png Binary file QTfrontend/res/btnMoreWind.png has changed