# HG changeset patch # User koda # Date 1289346981 -3600 # Node ID f2eb9ac629e47cec5540e317efaa3cdbd12b26be # Parent e9c7182affa782e1c216d4a684daecec6514aeb3 added two games modes and one weaponset diff -r e9c7182affa7 -r f2eb9ac629e4 ChangeLog.txt --- a/ChangeLog.txt Tue Nov 09 19:17:53 2010 +0100 +++ b/ChangeLog.txt Wed Nov 10 00:56:21 2010 +0100 @@ -13,8 +13,8 @@ + New weapons: Flamethrower, Hammer, Old Limburger, Piano Strike, Sticky Mines + Weapons' projectiles will how be launched from their barrels instead of the hog's center + Flying Saucers may be used for moving below the water surface - + New default game schemes: Clean Slate, Fort Mode, Timeless - + New default weapon set: Clean Slate + + New default game schemes: Clean Slate, Fort Mode, Timeless, Thinking with Portals, King Mode + + New default weapon set: Clean Slate, Thinking with Portals + Bomb clusters/Melon parts inherit some of the original bomb's speed + Extended game statistics + Improved health bar updating diff -r e9c7182affa7 -r f2eb9ac629e4 QTfrontend/ammoSchemeModel.cpp --- a/QTfrontend/ammoSchemeModel.cpp Tue Nov 09 19:17:53 2010 +0100 +++ b/QTfrontend/ammoSchemeModel.cpp Wed Nov 10 00:56:21 2010 +0100 @@ -74,7 +74,10 @@ << "Barrel Mayhem" << "Tunnel Hogs" << "Fort Mode" - << "Timeless"; + << "Timeless" + << "Thinking with Portals" + << "King Mode" + ; numberOfDefaultSchemes = predefSchemesNames.size(); @@ -428,6 +431,85 @@ << QVariant(0) // health dec amt 34 ; + QList thinkingportals; + thinkingportals + << predefSchemesNames[9] // name 0 + << QVariant(false) // fortsmode 1 + << QVariant(false) // team divide 2 + << QVariant(false) // solid land 3 + << QVariant(false) // border 4 + << QVariant(false) // low gravity 5 + << QVariant(false) // laser sight 6 + << QVariant(false) // invulnerable 7 + << QVariant(false) // reset health 8 + << QVariant(false) // vampiric 9 + << QVariant(false) // karma 10 + << QVariant(true) // artillery 11 + << QVariant(true) // random order 12 + << QVariant(false) // king 13 + << QVariant(false) // place hog 14 + << 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(false) // per hog ammo 21 + << QVariant(100) // damage modfier 22 + << QVariant(45) // turn time 23 + << QVariant(100) // init health 24 + << QVariant(15) // sudden death 25 + << QVariant(2) // case prob 26 + << QVariant(3) // mines time 27 + << QVariant(5) // mines number 28 + << QVariant(0) // mine dud pct 29 + << QVariant(5) // explosives 30 + << QVariant(25) // health case pct 31 + << QVariant(25) // health case amt 32 + << QVariant(47) // water rise amt 33 + << QVariant(5) // health dec amt 34 + ; + + QList kingmode; + kingmode + << predefSchemesNames[10] // name 0 + << QVariant(false) // fortsmode 1 + << QVariant(false) // team divide 2 + << QVariant(false) // solid land 3 + << QVariant(false) // border 4 + << QVariant(false) // low gravity 5 + << QVariant(false) // laser sight 6 + << QVariant(false) // invulnerable 7 + << QVariant(false) // reset health 8 + << QVariant(false) // vampiric 9 + << QVariant(false) // karma 10 + << QVariant(false) // artillery 11 + << QVariant(true) // random order 12 + << QVariant(true) // king 13 + << QVariant(true) // place hog 14 + << QVariant(true) // 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(false) // per hog ammo 21 + << QVariant(100) // damage modfier 22 + << QVariant(45) // turn time 23 + << QVariant(100) // init health 24 + << QVariant(15) // sudden death 25 + << QVariant(5) // case prob 26 + << QVariant(3) // mines time 27 + << QVariant(3) // mines number 28 + << QVariant(20) // mine dud pct 29 + << QVariant(3) // explosives 30 + << QVariant(35) // health case pct 31 + << QVariant(30) // health case amt 32 + << QVariant(30) // water rise amt 33 + << QVariant(5) // health dec amt 34 + ; + + schemes.append(defaultScheme); schemes.append(proMode); schemes.append(shoppa); @@ -437,6 +519,8 @@ schemes.append(tunnelhogs); schemes.append(forts); schemes.append(timeless); + schemes.append(thinkingportals); + schemes.append(kingmode); int size = fileConfig.beginReadArray("schemes"); diff -r e9c7182affa7 -r f2eb9ac629e4 QTfrontend/hwconsts.cpp.in --- a/QTfrontend/hwconsts.cpp.in Tue Nov 09 19:17:53 2010 +0100 +++ b/QTfrontend/hwconsts.cpp.in Wed Nov 10 00:56:21 2010 +0100 @@ -76,6 +76,12 @@ "0000000000000000000000000000000000000000000000000" "0000000000000205500000040007004000000000200000000" "1111111111111111111111111111111111111111111101111" + )) + << qMakePair(QString("Thinking with Portals"), QString( + "9000009002000000002100000000000000110000090000000" + "0405040541600655546554464776576666666155510101117" + "0000000000000205500000040007004000000000200000000" + "1311110312111111123114111111111111111211111101111" )); QColor *colors[] = {