# HG changeset patch # User henek # Date 1289010720 14400 # Node ID eb7981f348003aa24ccca27885e6718e4347ef9f # Parent 980ec01b98e18e66966678b269f1df231e9bbc2a Remove the last vestiges of the shoppa hack by adding 2 spinners for percentage health and amount of health in crate, also update translations and increase SD spinner (some users have requested it) diff -r 980ec01b98e1 -r eb7981f34800 QTfrontend/ammoSchemeModel.cpp --- a/QTfrontend/ammoSchemeModel.cpp Fri Nov 05 21:59:02 2010 -0400 +++ b/QTfrontend/ammoSchemeModel.cpp Fri Nov 05 22:32:00 2010 -0400 @@ -54,6 +54,8 @@ << QVariant(4) // mines number 28 << QVariant(0) // mine dud pct 29 << QVariant(2) // explosives 30 + << QVariant(35) // health case pct 31 + << QVariant(25) // health case amt 32 ; AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) : @@ -104,6 +106,8 @@ << "minesnum" // 28 << "minedudpct" // 29 << "explosives" // 30 + << "healthprobability" // 31 + << "healthcaseamount" // 32 ; QList proMode; @@ -139,6 +143,8 @@ << QVariant(0) // mines number 28 << QVariant(0) // mine dud pct 29 << QVariant(2) // explosives 30 + << QVariant(35) // health case pct 31 + << QVariant(25) // health case amt 32 ; QList shoppa; @@ -174,6 +180,8 @@ << QVariant(0) // mines number 28 << QVariant(0) // mine dud pct 29 << QVariant(0) // explosives 30 + << QVariant(0) // health case pct 31 + << QVariant(25) // health case amt 32 ; QList cleanslate; @@ -209,6 +217,8 @@ << QVariant(4) // mines number 28 << QVariant(0) // mine dud pct 29 << QVariant(2) // explosives 30 + << QVariant(35) // health case pct 31 + << QVariant(25) // health case amt 32 ; QList minefield; @@ -244,6 +254,8 @@ << QVariant(80) // mines number 28 << QVariant(0) // mine dud pct 29 << QVariant(0) // explosives 30 + << QVariant(35) // health case pct 31 + << QVariant(25) // health case amt 32 ; QList barrelmayhem; @@ -279,6 +291,8 @@ << QVariant(0) // mines number 28 << QVariant(0) // mine dud pct 29 << QVariant(80) // explosives 30 + << QVariant(35) // health case pct 31 + << QVariant(25) // health case amt 32 ; QList tunnelhogs; @@ -314,6 +328,8 @@ << QVariant(10) // mines number 28 << QVariant(10) // mine dud pct 29 << QVariant(10) // explosives 30 + << QVariant(35) // health case pct 31 + << QVariant(25) // health case amt 32 ; schemes.append(defaultScheme); diff -r 980ec01b98e1 -r eb7981f34800 QTfrontend/gamecfgwidget.cpp --- a/QTfrontend/gamecfgwidget.cpp Fri Nov 05 21:59:02 2010 -0400 +++ b/QTfrontend/gamecfgwidget.cpp Fri Nov 05 22:32:00 2010 -0400 @@ -164,6 +164,8 @@ sl.append(QString("e$casefreq %1").arg(schemeData(26).toInt())); sl.append(QString("e$minedudpct %1").arg(schemeData(29).toInt())); sl.append(QString("e$explosives %1").arg(schemeData(30).toInt())); + sl.append(QString("e$healthprob %1").arg(schemeData(31).toInt())); + sl.append(QString("e$hcaseamount %1").arg(schemeData(32).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 980ec01b98e1 -r eb7981f34800 QTfrontend/pages.cpp --- a/QTfrontend/pages.cpp Fri Nov 05 21:59:02 2010 -0400 +++ b/QTfrontend/pages.cpp Fri Nov 05 22:32:00 2010 -0400 @@ -1570,7 +1570,6 @@ l->setFixedSize(32,32); l->setPixmap(QPixmap(":/res/iconDamage.png")); glBSLayout->addWidget(l,0,1,1,1); - SB_DamageModifier = new QSpinBox(gbBasicSettings); SB_DamageModifier->setRange(10, 300); SB_DamageModifier->setValue(100); @@ -1585,7 +1584,6 @@ l->setFixedSize(32,32); l->setPixmap(QPixmap(":/res/iconTime.png")); glBSLayout->addWidget(l,1,1,1,1); - SB_TurnTime = new QSpinBox(gbBasicSettings); SB_TurnTime->setRange(1, 9999); SB_TurnTime->setValue(45); @@ -1600,7 +1598,6 @@ l->setFixedSize(32,32); l->setPixmap(QPixmap(":/res/iconHealth.png")); glBSLayout->addWidget(l,2,1,1,1); - SB_InitHealth = new QSpinBox(gbBasicSettings); SB_InitHealth->setRange(50, 200); SB_InitHealth->setValue(100); @@ -1615,9 +1612,8 @@ l->setFixedSize(32,32); l->setPixmap(QPixmap(":/res/iconSuddenDeath.png")); glBSLayout->addWidget(l,3,1,1,1); - SB_SuddenDeath = new QSpinBox(gbBasicSettings); - SB_SuddenDeath->setRange(0, 50); + SB_SuddenDeath->setRange(0, 999); SB_SuddenDeath->setValue(15); SB_SuddenDeath->setSingleStep(3); glBSLayout->addWidget(SB_SuddenDeath,3,2,1,1); @@ -1630,70 +1626,97 @@ l->setFixedSize(32,32); l->setPixmap(QPixmap(":/res/iconBox.png")); glBSLayout->addWidget(l,4,1,1,1); - SB_CaseProb = new FreqSpinBox(gbBasicSettings); SB_CaseProb->setRange(0, 9); SB_CaseProb->setValue(5); glBSLayout->addWidget(SB_CaseProb,4,2,1,1); l = new QLabel(gbBasicSettings); - l->setText(QLabel::tr("Mines Time")); + l->setText(QLabel::tr("% Health Crates")); l->setWordWrap(true); glBSLayout->addWidget(l,5,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); + l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon + glBSLayout->addWidget(l,5,1,1,1); + SB_HealthCrates = new QSpinBox(gbBasicSettings); + SB_HealthCrates->setRange(0, 100); + SB_HealthCrates->setValue(35); + SB_HealthCrates->setSingleStep(5); + glBSLayout->addWidget(SB_HealthCrates,5,2,1,1); + + l = new QLabel(gbBasicSettings); + l->setText(QLabel::tr("Health in Crates")); + l->setWordWrap(true); + glBSLayout->addWidget(l,6,0,1,1); + l = new QLabel(gbBasicSettings); + l->setFixedSize(32,32); + l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon + glBSLayout->addWidget(l,6,1,1,1); + SB_CrateHealth = new QSpinBox(gbBasicSettings); + SB_CrateHealth->setRange(0, 200); + SB_CrateHealth->setValue(25); + SB_CrateHealth->setSingleStep(5); + glBSLayout->addWidget(SB_CrateHealth,6,2,1,1); + + l = new QLabel(gbBasicSettings); + l->setText(QLabel::tr("Mines Time")); + l->setWordWrap(true); + glBSLayout->addWidget(l,7,0,1,1); + l = new QLabel(gbBasicSettings); + l->setFixedSize(32,32); l->setPixmap(QPixmap(":/res/iconTime.png")); // TODO: icon - glBSLayout->addWidget(l,5,1,1,1); + glBSLayout->addWidget(l,7,1,1,1); SB_MinesTime = new QSpinBox(gbBasicSettings); SB_MinesTime->setRange(-1, 5); SB_MinesTime->setValue(3); SB_MinesTime->setSingleStep(1); SB_MinesTime->setSpecialValueText(tr("Random")); SB_MinesTime->setSuffix(" "+ tr("Seconds")); - glBSLayout->addWidget(SB_MinesTime,5,2,1,1); + glBSLayout->addWidget(SB_MinesTime,7,2,1,1); l = new QLabel(gbBasicSettings); l->setText(QLabel::tr("Mines")); l->setWordWrap(true); - glBSLayout->addWidget(l,6,0,1,1); + glBSLayout->addWidget(l,8,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); l->setPixmap(QPixmap(":/res/iconMine.png")); // TODO: icon - glBSLayout->addWidget(l,6,1,1,1); + glBSLayout->addWidget(l,8,1,1,1); SB_Mines = new QSpinBox(gbBasicSettings); SB_Mines->setRange(0, 80); SB_Mines->setValue(0); SB_Mines->setSingleStep(5); - glBSLayout->addWidget(SB_Mines,6,2,1,1); + glBSLayout->addWidget(SB_Mines,8,2,1,1); l = new QLabel(gbBasicSettings); l->setText(QLabel::tr("% Dud Mines")); l->setWordWrap(true); - glBSLayout->addWidget(l,7,0,1,1); + glBSLayout->addWidget(l,9,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); l->setPixmap(QPixmap(":/res/iconDud.png")); - glBSLayout->addWidget(l,7,1,1,1); + glBSLayout->addWidget(l,9,1,1,1); SB_MineDuds = new QSpinBox(gbBasicSettings); SB_MineDuds->setRange(0, 100); SB_MineDuds->setValue(0); SB_MineDuds->setSingleStep(5); - glBSLayout->addWidget(SB_MineDuds,7,2,1,1); + glBSLayout->addWidget(SB_MineDuds,9,2,1,1); l = new QLabel(gbBasicSettings); l->setText(QLabel::tr("Explosives")); l->setWordWrap(true); - glBSLayout->addWidget(l,8,0,1,1); + glBSLayout->addWidget(l,10,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); l->setPixmap(QPixmap(":/res/iconDamage.png")); - glBSLayout->addWidget(l,8,1,1,1); + glBSLayout->addWidget(l,10,1,1,1); SB_Explosives = new QSpinBox(gbBasicSettings); SB_Explosives->setRange(0, 40); SB_Explosives->setValue(0); SB_Explosives->setSingleStep(1); - glBSLayout->addWidget(SB_Explosives,8,2,1,1); + glBSLayout->addWidget(SB_Explosives,10,2,1,1); l = new QLabel(gbBasicSettings); @@ -1755,6 +1778,8 @@ mapper->addMapping(SB_Mines, 28); mapper->addMapping(SB_MineDuds, 29); mapper->addMapping(SB_Explosives, 30); + mapper->addMapping(SB_HealthCrates, 31); + mapper->addMapping(SB_CrateHealth, 32); mapper->toFirst(); } diff -r 980ec01b98e1 -r eb7981f34800 QTfrontend/pages.h --- a/QTfrontend/pages.h Fri Nov 05 21:59:02 2010 -0400 +++ b/QTfrontend/pages.h Fri Nov 05 22:32:00 2010 -0400 @@ -486,6 +486,8 @@ QSpinBox * SB_InitHealth; QSpinBox * SB_SuddenDeath; FreqSpinBox * SB_CaseProb; + QSpinBox * SB_HealthCrates; + QSpinBox * SB_CrateHealth; QSpinBox * SB_MinesTime; QSpinBox * SB_Mines; QSpinBox * SB_MineDuds; diff -r 980ec01b98e1 -r eb7981f34800 hedgewars/uAmmos.pas --- a/hedgewars/uAmmos.pas Fri Nov 05 21:59:02 2010 -0400 +++ b/hedgewars/uAmmos.pas Fri Nov 05 22:32:00 2010 -0400 @@ -44,8 +44,7 @@ function GetAmmoByNum(num: Longword): PHHAmmo; function GetAmmoEntry(var Hedgehog: THedgehog): PAmmo; -var shoppa: boolean; - StoreCnt: Longword; +var StoreCnt: Longword; implementation uses uMisc, uGears, uWorld, uLocale, uConsole, uMobile; @@ -97,14 +96,6 @@ begin TryDo((byte(ammoLoadout[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoProbability[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoDelay[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoReinforcement[0]) = byte(ord(High(TAmmoType)))), 'Incomplete or missing ammo scheme set (incompatible frontend or demo/save?)', true); -// FIXME - TEMPORARY hardcoded check on shoppa pending creation of crate *type* probability editor -substr:= Copy(ammoLoadout,1,42); -if (substr = '000000990000009000000000000000000000000000') or // ropes + parachute - (substr = '000000900000000000000000000000000000009000') or // saucer - (substr = '000000900000000000000000000000000000000009') or // portal - (substr = '000000990000000000000000000000000000000000') // ropes - then shoppa:= true; - inc(StoreCnt); TryDo(StoreCnt <= cMaxHHs, 'Ammo stores overflow', true); @@ -432,7 +423,6 @@ procedure initModule; begin - shoppa:= false; StoreCnt:= 0; ammoLoadout:= ''; ammoProbability:= ''; diff -r 980ec01b98e1 -r eb7981f34800 hedgewars/uConsole.pas --- a/hedgewars/uConsole.pas Fri Nov 05 21:59:02 2010 -0400 +++ b/hedgewars/uConsole.pas Fri Nov 05 22:32:00 2010 -0400 @@ -234,6 +234,8 @@ RegisterVariable('delay' , vtLongInt, @cInactDelay , false); RegisterVariable('ready' , vtLongInt, @cReadyDelay , false); RegisterVariable('casefreq', vtLongInt, @cCaseFactor , false); + RegisterVariable('healthprob', vtLongInt, @cHealthCaseProb, false); + RegisterVariable('hcaseamount', vtLongInt, @cHealthCaseAmount, false); RegisterVariable('sd_turns', vtLongInt, @cSuddenDTurns , false); RegisterVariable('damagepct',vtLongInt, @cDamagePercent , false); RegisterVariable('minedudpct',vtLongInt,@cMineDudPercent, false); diff -r 980ec01b98e1 -r eb7981f34800 hedgewars/uGears.pas --- a/hedgewars/uGears.pas Fri Nov 05 21:59:02 2010 -0400 +++ b/hedgewars/uGears.pas Fri Nov 05 22:32:00 2010 -0400 @@ -1657,7 +1657,7 @@ case crate of HealthCrate: begin - FollowGear^.Health := 25; + FollowGear^.Health := cHealthCaseAmount; FollowGear^.Pos := posCaseHealth; AddCaption(GetEventString(eidNewHealthPack), cWhiteColor, capgrpAmmoInfo); end; @@ -1699,14 +1699,13 @@ t:=0; a:=aTot; h:= 1; -// FIXME - shoppa is TEMPORARY REMOVE WHEN CRATE PROBABILITY ALLOWS DISABLING OF HEALTH CRATES -// Preserving health crate distribution of 35% until that happens + if (aTot+uTot) <> 0 then - if not shoppa and ((GameFlags and gfInvulnerable) = 0) then + if ((GameFlags and gfInvulnerable) = 0) then begin - h:= 3500; + h:= cHealthCaseProb * 100; t:= GetRandom(10000); - a:= 6500*aTot div (aTot+uTot) + a:= (10000-h)*aTot div (aTot+uTot) end else begin @@ -1718,7 +1717,7 @@ if t Default - التلقائي - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + التلقائي @@ -1379,6 +1351,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_bg.ts --- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1105,35 +1105,7 @@ Default - По подразбиране - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + По подразбиране @@ -1337,6 +1309,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_cs.ts --- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1110,35 +1110,7 @@ Default - Základní - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + Základní @@ -1342,6 +1314,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_de.ts --- a/share/hedgewars/Data/Locale/hedgewars_de.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1157,35 +1157,7 @@ Default - Standard - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + Standard @@ -1395,6 +1367,14 @@ Quality Qualität + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_en.ts --- a/share/hedgewars/Data/Locale/hedgewars_en.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1151,35 +1151,7 @@ Default - Default - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + Default @@ -1383,6 +1355,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_es.ts --- a/share/hedgewars/Data/Locale/hedgewars_es.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1155,35 +1155,35 @@ Default - Predeterminado + Predeterminado Pro mode - Modo pro + Modo pro Shoppa - Shoppa + Shoppa Basketball - Baloncesto + Baloncesto Minefield - Campo de minas + Campo de minas Barrel mayhem - Bodega infernal + Bodega infernal Tunnel hogs - Erizos subterráneos + Erizos subterráneos Crazy - Lunático + Lunático @@ -1396,6 +1396,14 @@ Quality Calidad + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_fi.ts --- a/share/hedgewars/Data/Locale/hedgewars_fi.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1151,35 +1151,35 @@ Default - Oletus + Oletus Pro mode - Pro-tila + Pro-tila Shoppa - Shoppa + Shoppa Basketball - Koripallo + Koripallo Minefield - Miinakenttä + Miinakenttä Barrel mayhem - Tynnyrikaaos + Tynnyrikaaos Tunnel hogs - Tunnelisiilit + Tunnelisiilit Crazy - Sekopäinen + Sekopäinen @@ -1383,6 +1383,14 @@ Quality Laatu + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_fr.ts --- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Fri Nov 05 22:32:00 2010 -0400 @@ -605,11 +605,6 @@ - Like Hedgewars? Become a fan on %1 or join our group at %2. You could follow us on %3 as well! - Tips - - - Feel free to draw your own graves, hats, flags or even maps and themes! But note that you'll have to share them somewhere to use them online. Tips @@ -639,6 +634,11 @@ Tips + + Like Hedgewars? Become a fan on %1 or follow us on %2! + Tips + + PageMultiplayer @@ -868,7 +868,7 @@ Enable random mines - Activer les mines aléatoires + Activer les mines aléatoires Gain 80% of the damage you do back in health @@ -1147,35 +1147,7 @@ Default - Défaut - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + Défaut @@ -1341,7 +1313,7 @@ Type - + Type Grave @@ -1379,6 +1351,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit @@ -1648,7 +1628,7 @@ Add Mines - Ajouter des Mines + Ajouter des Mines Random Order diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_hu.ts --- a/share/hedgewars/Data/Locale/hedgewars_hu.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1140,35 +1140,7 @@ Default - Default - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + Default @@ -1378,6 +1350,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_it.ts --- a/share/hedgewars/Data/Locale/hedgewars_it.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1151,35 +1151,7 @@ Default - Default - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + Default @@ -1389,6 +1361,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_ja.ts --- a/share/hedgewars/Data/Locale/hedgewars_ja.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1100,35 +1100,7 @@ Default - デフォールト - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + デフォールト @@ -1332,6 +1304,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_pl.ts --- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1177,35 +1177,35 @@ Default - Domyślne + Domyślne Pro mode - Pro mode + Pro mode Shoppa - Shoppa + Shoppa Basketball - Basketball + Basketball Minefield - Minefield + Minefield Barrel mayhem - Barrel mayhem + Barrel mayhem Tunnel hogs - Tunnel hogs + Tunnel hogs Crazy - Crazy + Crazy @@ -1421,6 +1421,14 @@ Quality Jakość + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_pt_BR.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1209,35 +1209,35 @@ Default - Padrão + Padrão Pro mode - Modo Pro + Modo Pro Shoppa - Shoppa + Shoppa Basketball - Basketball + Basketball Minefield - Campo Minado + Campo Minado Barrel mayhem - Inferno de Barris + Inferno de Barris Tunnel hogs - Túneis + Túneis Crazy - Crazy + Crazy @@ -1451,6 +1451,14 @@ Quality Qualidade + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_pt_PT.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1151,35 +1151,35 @@ Default - Predefinido + Predefinido Pro mode - Modo Profissional + Modo Profissional Shoppa - Shoppa + Shoppa Basketball - Basquetebol + Basquetebol Minefield - Campo de minas + Campo de minas Barrel mayhem - Barrel mayhem + Barrel mayhem Tunnel hogs - Tuneis + Tuneis Crazy - Crazy + Crazy @@ -1383,6 +1383,14 @@ Quality Qualidade + + % Health Crates + % de Caixas de Vida + + + Health in Crates + Vida por Caixa + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_ru.ts --- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1154,35 +1154,7 @@ Default - По умолчанию - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + По умолчанию @@ -1392,6 +1364,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_sk.ts --- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1154,35 +1154,7 @@ Default - Východzie - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + Východzie @@ -1392,6 +1364,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_sv.ts --- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Fri Nov 05 22:32:00 2010 -0400 @@ -347,7 +347,7 @@ Health graph - Hälsograf + Livgraf Ranking @@ -1151,35 +1151,35 @@ Default - Standard + Standard Pro mode - Pro-läge + Pro-läge Shoppa - Shoppa + Shoppa Basketball - Basket + Basket Minefield - Minfält + Minfält Barrel mayhem - Tunnförödelse + Tunnförödelse Tunnel hogs - Tunnelkottar + Tunnelkottar Crazy - Galet + Galet @@ -1389,6 +1389,14 @@ Quality Kvalitet + + % Health Crates + % förbandslådor + + + Health in Crates + Liv i förbandslådor + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_tr_TR.ts --- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1112,35 +1112,7 @@ Default - Öntanımlı - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + Öntanımlı @@ -1344,6 +1316,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_uk.ts --- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1154,35 +1154,7 @@ Default - За замовчуванням - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + За замовчуванням @@ -1392,6 +1364,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_zh_CN.ts --- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1154,35 +1154,35 @@ Default - 默认 + 默认 Pro mode - Pro 模式 + Pro 模式 Shoppa - 绳索模式 + 绳索模式 Basketball - 篮球模式 + 篮球模式 Minefield - 地雷模式 + 地雷模式 Barrel mayhem - 武器不共享 + 武器不共享 Tunnel hogs - 洞穴刺猬 + 洞穴刺猬 Crazy - 疯狂模式 + 疯狂模式 @@ -1386,6 +1386,14 @@ Quality 价值 + + % Health Crates + + + + Health in Crates + + QLineEdit diff -r 980ec01b98e1 -r eb7981f34800 share/hedgewars/Data/Locale/hedgewars_zh_TW.ts --- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Fri Nov 05 21:59:02 2010 -0400 +++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Fri Nov 05 22:32:00 2010 -0400 @@ -1140,35 +1140,7 @@ Default - 默認 - - - Pro mode - - - - Shoppa - - - - Basketball - - - - Minefield - - - - Barrel mayhem - - - - Tunnel hogs - - - - Crazy - + 默認 @@ -1372,6 +1344,14 @@ Quality + + % Health Crates + + + + Health in Crates + + QLineEdit