# HG changeset patch # User nemo # Date 1288980872 14400 # Node ID f437909ac9d422586ce1348cfbf08c41b424a917 # Parent 7426c66577580cb9e6cde36d5a0f4e75e4ee2076 Replace the deprecated Basketball mode with Clean Slate mode which uses a few of the new scheme options diff -r 7426c6657758 -r f437909ac9d4 QTfrontend/ammoSchemeModel.cpp --- a/QTfrontend/ammoSchemeModel.cpp Fri Nov 05 13:45:06 2010 -0400 +++ b/QTfrontend/ammoSchemeModel.cpp Fri Nov 05 14:14:32 2010 -0400 @@ -65,7 +65,7 @@ << "Default" << "Pro Mode" << "Shoppa" - << "Basketball" + << "Clean Slate" << "Minefield" << "Barrel Mayhem" << "Tunnel Hogs"; @@ -176,39 +176,39 @@ << QVariant(0) // explosives 30 ; - QList basketball; - basketball + QList cleanslate; + cleanslate << predefSchemesNames[3] // name 0 << QVariant(false) // fortsmode 1 << QVariant(false) // team divide 2 - << QVariant(true) // solid land 3 - << QVariant(true) // border 4 - << QVariant(true) // low gravity 5 + << QVariant(false) // solid land 3 + << QVariant(false) // border 4 + << QVariant(false) // low gravity 5 << QVariant(false) // laser sight 6 - << QVariant(true) // invulnerable 7 - << QVariant(false) // reset health 8 + << QVariant(false) // invulnerable 7 + << QVariant(true) // reset health 8 << QVariant(false) // vampiric 9 << QVariant(false) // karma 10 << QVariant(false) // artillery 11 << QVariant(true) // random order 12 << QVariant(false) // king 13 << QVariant(false) // place hog 14 - << QVariant(true) // shared ammo 15 - << QVariant(true) // disable girders 16 + << QVariant(false) // shared ammo 15 + << QVariant(false) // disable girders 16 << QVariant(false) // disable land objects 17 << QVariant(false) // AI survival 18 - << QVariant(false) // inf. attack 19 - << QVariant(false) // reset weps 20 + << QVariant(true) // inf. attack 19 + << QVariant(true) // reset weps 20 << QVariant(false) // per hog ammo 21 << QVariant(100) // damage modfier 22 - << QVariant(30) // turn time 23 + << QVariant(45) // turn time 23 << QVariant(100) // init health 24 << QVariant(15) // sudden death 25 - << QVariant(0) // case prob 26 + << QVariant(5) // case prob 26 << QVariant(3) // mines time 27 - << QVariant(0) // mines number 28 + << QVariant(4) // mines number 28 << QVariant(0) // mine dud pct 29 - << QVariant(0) // explosives 30 + << QVariant(2) // explosives 30 ; QList minefield; @@ -319,7 +319,7 @@ schemes.append(defaultScheme); schemes.append(proMode); schemes.append(shoppa); - schemes.append(basketball); + schemes.append(cleanslate); schemes.append(minefield); schemes.append(barrelmayhem); schemes.append(tunnelhogs); diff -r 7426c6657758 -r f437909ac9d4 QTfrontend/hwconsts.cpp.in --- a/QTfrontend/hwconsts.cpp.in Fri Nov 05 13:45:06 2010 -0400 +++ b/QTfrontend/hwconsts.cpp.in Fri Nov 05 14:14:32 2010 -0400 @@ -65,11 +65,11 @@ "0000000000000000000000000000000000000000000000000" "1111111111111111111111111111111111111111101101111" )) - << qMakePair(QString("Basketball"),QString( - "0000009000000900000000000000000000000000000000000" - "0000000000000000000000000000000000000000000000000" - "0000000000000005500000040007004000000000200000000" - "1111111111111111111111111111111111111111111101111" + << qMakePair(QString("Clean Slate"),QString( + "1010009000010000011000000000000000000000000000001" + "0405040541600655546554464776576666666155510101117" + "0000000000000205500000040007004000000000200000000" + "1311110312111111123114111111111111111211111101111" )) << qMakePair(QString("Minefield"), QString( "0000009900090000000300000000000000000000000000000"