# HG changeset patch # User unc0rr # Date 1239550426 0 # Node ID f32b18c5d49537571bb2e2769dae6fee44620750 # Parent 213d368a002f022d833881801fda6b9d1aa58f85 Add Shoppa game scheme diff -r 213d368a002f -r f32b18c5d495 QTfrontend/ammoSchemeModel.cpp --- a/QTfrontend/ammoSchemeModel.cpp Sun Apr 12 15:30:41 2009 +0000 +++ b/QTfrontend/ammoSchemeModel.cpp Sun Apr 12 15:33:46 2009 +0000 @@ -41,13 +41,14 @@ AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) : QAbstractTableModel(parent), - numberOfDefaultSchemes(2), + numberOfDefaultSchemes(3), fileConfig(fileName, QSettings::IniFormat) { QStringList predefSchemesNames; predefSchemesNames << "Default" - << "Pro mode"; + << "Pro mode" + << "Shoppa"; spNames = QStringList() << "name" // 0 @@ -68,7 +69,7 @@ QList proMode; proMode - << QVariant("Pro mode") // name 0 + << predefSchemesNames[1] // name 0 << QVariant(false) // fortsmode 1 << QVariant(false) // team divide 2 << QVariant(false) // solid land 3 @@ -84,8 +85,27 @@ << QVariant(0) // case prob 13 ; + QList shoppa; + shoppa + << predefSchemesNames[2] // name 0 + << QVariant(false) // fortsmode 1 + << QVariant(false) // team divide 2 + << QVariant(true) // solid land 3 + << QVariant(true) // border 4 + << QVariant(false) // low gravity 5 + << QVariant(false) // laser sight 6 + << QVariant(false) // invulnerable 7 + << QVariant(false) // add mines 8 + << QVariant(100) // damage modfier 9 + << QVariant(30) // turn time 10 + << QVariant(100) // init health 11 + << QVariant(50) // sudden death 12 + << QVariant(0) // case prob 13 + ; + schemes.append(defaultScheme); schemes.append(proMode); + schemes.append(shoppa); int size = fileConfig.beginReadArray("schemes"); diff -r 213d368a002f -r f32b18c5d495 QTfrontend/hwconsts.cpp.in --- a/QTfrontend/hwconsts.cpp.in Sun Apr 12 15:30:41 2009 +0000 +++ b/QTfrontend/hwconsts.cpp.in Sun Apr 12 15:33:46 2009 +0000 @@ -33,7 +33,7 @@ QList< QPair > cDefaultAmmos = QList< QPair >() << qMakePair(QString("Default"), *cDefaultAmmoStore) - << qMakePair(QString("Crazy"), QString("999999999999999999999999999999999999")) + << qMakePair(QString("Crazy"), QString("999999999999999999299999999999999929")) << qMakePair(QString("Pro mode"), QString("909000900000000000000900000000000000")) << qMakePair(QString("Shoppa"), QString("000000990000000000000000000000000000")) ;