diff -r e127b3d26248 -r d83b53997e0b QTfrontend/ammoSchemeModel.cpp --- a/QTfrontend/ammoSchemeModel.cpp Fri Nov 12 15:20:54 2010 +0100 +++ b/QTfrontend/ammoSchemeModel.cpp Fri Nov 12 17:08:31 2010 +0100 @@ -45,19 +45,20 @@ << 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(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 - << QVariant(47) // water rise amt 33 - << QVariant(5) // health dec amt 34 + << 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 ; AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) : @@ -103,6 +104,7 @@ << "infattack" // 19 << "resetweps" // 20 << "perhogammo" // 21 + << "disablewind" // 22 << "damagefactor" // 22 << "turntime" // 23 << "health" // 24 @@ -142,19 +144,20 @@ << QVariant(false) // inf. attack 19 << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 - << QVariant(100) // damage modfier 22 - << QVariant(15) // turn time 23 - << QVariant(100) // init health 24 - << QVariant(15) // sudden death 25 - << QVariant(0) // case prob 26 - << QVariant(3) // mines time 27 - << 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 - << QVariant(47) // water rise amt 33 - << QVariant(5) // health dec amt 34 + << 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 ; QList shoppa; @@ -181,19 +184,20 @@ << QVariant(false) // inf. attack 19 << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 - << QVariant(100) // damage modfier 22 - << QVariant(30) // turn time 23 - << QVariant(100) // init health 24 - << QVariant(50) // sudden death 25 - << QVariant(1) // case prob 26 - << QVariant(3) // mines time 27 - << 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 - << QVariant(47) // water rise amt 33 - << QVariant(5) // health dec amt 34 + << 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 ; QList cleanslate; @@ -220,19 +224,20 @@ << QVariant(true) // inf. attack 19 << QVariant(true) // 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(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 - << QVariant(47) // water rise amt 33 - << QVariant(5) // health dec amt 34 + << 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 ; QList minefield; @@ -259,19 +264,20 @@ << QVariant(false) // inf. attack 19 << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 - << QVariant(150) // damage modfier 22 - << QVariant(30) // turn time 23 - << QVariant(50) // init health 24 - << QVariant(15) // sudden death 25 - << QVariant(0) // case prob 26 - << QVariant(0) // mines time 27 - << 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 - << QVariant(47) // water rise amt 33 - << QVariant(5) // health dec amt 34 + << 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 ; QList barrelmayhem; @@ -298,19 +304,20 @@ << QVariant(false) // inf. attack 19 << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 - << QVariant(100) // damage modfier 22 - << QVariant(30) // turn time 23 - << QVariant(100) // init health 24 - << QVariant(15) // sudden death 25 - << QVariant(0) // case prob 26 - << QVariant(0) // mines time 27 - << 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 - << QVariant(47) // water rise amt 33 - << QVariant(5) // health dec amt 34 + << 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 ; QList tunnelhogs; @@ -337,19 +344,20 @@ << QVariant(false) // inf. attack 19 << QVariant(false) // reset weps 20 << QVariant(false) // per hog ammo 21 - << QVariant(100) // damage modfier 22 - << QVariant(30) // turn time 23 - << QVariant(100) // init health 24 - << QVariant(15) // sudden death 25 - << QVariant(5) // case prob 26 - << QVariant(3) // mines time 27 - << 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 - << QVariant(47) // water rise amt 33 - << QVariant(5) // health dec amt 34 + << 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 ; QList forts; @@ -376,19 +384,20 @@ << 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(0) // 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 - << QVariant(47) // water rise amt 33 - << QVariant(5) // health dec amt 34 + << 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 ; QList timeless; @@ -415,19 +424,20 @@ << QVariant(false) // inf. attack 19 << QVariant(false) // reset weps 20 << QVariant(true) // per hog ammo 21 - << QVariant(100) // damage modfier 22 - << QVariant(9999) // turn time 23 - << QVariant(100) // init health 24 - << QVariant(15) // sudden death 25 - << QVariant(5) // case prob 26 - << QVariant(3) // mines time 27 - << QVariant(5) // mines number 28 - << QVariant(10) // mine dud pct 29 - << QVariant(2) // explosives 30 - << QVariant(35) // health case pct 31 - << QVariant(30) // health case amt 32 - << QVariant(0) // water rise amt 33 - << QVariant(0) // health dec amt 34 + << 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 ; QList thinkingportals; @@ -454,19 +464,20 @@ << 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 + << 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 ; QList kingmode; @@ -493,19 +504,20 @@ << 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 + << 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 ;