equal
deleted
inserted
replaced
63 << QVariant(47) // water rise amt 37 |
63 << QVariant(47) // water rise amt 37 |
64 << QVariant(5) // health dec amt 38 |
64 << QVariant(5) // health dec amt 38 |
65 << QVariant(100) // rope modfier 39 |
65 << QVariant(100) // rope modfier 39 |
66 << QVariant(100) // get away time 40 |
66 << QVariant(100) // get away time 40 |
67 << QVariant(0) // world edge 41 |
67 << QVariant(0) // world edge 41 |
|
68 << QVariant() // scriptparam 42 |
68 ; |
69 ; |
69 |
70 |
70 AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) : |
71 AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) : |
71 QAbstractTableModel(parent), |
72 QAbstractTableModel(parent), |
72 fileConfig(fileName, QSettings::IniFormat) |
73 fileConfig(fileName, QSettings::IniFormat) |
128 << "waterrise" // 37 |
129 << "waterrise" // 37 |
129 << "healthdecrease" // 38 |
130 << "healthdecrease" // 38 |
130 << "ropepct" // 39 |
131 << "ropepct" // 39 |
131 << "getawaytime" // 40 |
132 << "getawaytime" // 40 |
132 << "worldedge" // 41 |
133 << "worldedge" // 41 |
|
134 << "scriptparam" // scriptparam 42 |
133 ; |
135 ; |
134 |
136 |
135 QList<QVariant> proMode; |
137 QList<QVariant> proMode; |
136 proMode |
138 proMode |
137 << predefSchemesNames[1] // name 0 |
139 << predefSchemesNames[1] // name 0 |
174 << QVariant(47) // water rise amt 37 |
176 << QVariant(47) // water rise amt 37 |
175 << QVariant(5) // health dec amt 38 |
177 << QVariant(5) // health dec amt 38 |
176 << QVariant(100) // rope modfier 39 |
178 << QVariant(100) // rope modfier 39 |
177 << QVariant(100) // get away time 40 |
179 << QVariant(100) // get away time 40 |
178 << QVariant(0) // world edge 41 |
180 << QVariant(0) // world edge 41 |
|
181 << QVariant() // scriptparam 42 |
179 ; |
182 ; |
180 |
183 |
181 QList<QVariant> shoppa; |
184 QList<QVariant> shoppa; |
182 shoppa |
185 shoppa |
183 << predefSchemesNames[2] // name 0 |
186 << predefSchemesNames[2] // name 0 |
220 << QVariant(47) // water rise amt 37 |
223 << QVariant(47) // water rise amt 37 |
221 << QVariant(5) // health dec amt 38 |
224 << QVariant(5) // health dec amt 38 |
222 << QVariant(100) // rope modfier 39 |
225 << QVariant(100) // rope modfier 39 |
223 << QVariant(100) // get away time 40 |
226 << QVariant(100) // get away time 40 |
224 << QVariant(0) // world edge 41 |
227 << QVariant(0) // world edge 41 |
|
228 << QVariant() // scriptparam 42 |
225 ; |
229 ; |
226 |
230 |
227 QList<QVariant> cleanslate; |
231 QList<QVariant> cleanslate; |
228 cleanslate |
232 cleanslate |
229 << predefSchemesNames[3] // name 0 |
233 << predefSchemesNames[3] // name 0 |
266 << QVariant(47) // water rise amt 37 |
270 << QVariant(47) // water rise amt 37 |
267 << QVariant(5) // health dec amt 38 |
271 << QVariant(5) // health dec amt 38 |
268 << QVariant(100) // rope modfier 39 |
272 << QVariant(100) // rope modfier 39 |
269 << QVariant(100) // get away time 40 |
273 << QVariant(100) // get away time 40 |
270 << QVariant(0) // world edge 41 |
274 << QVariant(0) // world edge 41 |
|
275 << QVariant() // scriptparam 42 |
271 ; |
276 ; |
272 |
277 |
273 QList<QVariant> minefield; |
278 QList<QVariant> minefield; |
274 minefield |
279 minefield |
275 << predefSchemesNames[4] // name 0 |
280 << predefSchemesNames[4] // name 0 |
312 << QVariant(47) // water rise amt 37 |
317 << QVariant(47) // water rise amt 37 |
313 << QVariant(5) // health dec amt 38 |
318 << QVariant(5) // health dec amt 38 |
314 << QVariant(100) // rope modfier 39 |
319 << QVariant(100) // rope modfier 39 |
315 << QVariant(100) // get away time 40 |
320 << QVariant(100) // get away time 40 |
316 << QVariant(0) // world edge 41 |
321 << QVariant(0) // world edge 41 |
|
322 << QVariant() // scriptparam 42 |
317 ; |
323 ; |
318 |
324 |
319 QList<QVariant> barrelmayhem; |
325 QList<QVariant> barrelmayhem; |
320 barrelmayhem |
326 barrelmayhem |
321 << predefSchemesNames[5] // name 0 |
327 << predefSchemesNames[5] // name 0 |
358 << QVariant(47) // water rise amt 37 |
364 << QVariant(47) // water rise amt 37 |
359 << QVariant(5) // health dec amt 38 |
365 << QVariant(5) // health dec amt 38 |
360 << QVariant(100) // rope modfier 39 |
366 << QVariant(100) // rope modfier 39 |
361 << QVariant(100) // get away time 40 |
367 << QVariant(100) // get away time 40 |
362 << QVariant(0) // world edge 41 |
368 << QVariant(0) // world edge 41 |
|
369 << QVariant() // scriptparam 42 |
363 ; |
370 ; |
364 |
371 |
365 QList<QVariant> tunnelhogs; |
372 QList<QVariant> tunnelhogs; |
366 tunnelhogs |
373 tunnelhogs |
367 << predefSchemesNames[6] // name 0 |
374 << predefSchemesNames[6] // name 0 |
404 << QVariant(47) // water rise amt 37 |
411 << QVariant(47) // water rise amt 37 |
405 << QVariant(5) // health dec amt 38 |
412 << QVariant(5) // health dec amt 38 |
406 << QVariant(100) // rope modfier 39 |
413 << QVariant(100) // rope modfier 39 |
407 << QVariant(100) // get away time 40 |
414 << QVariant(100) // get away time 40 |
408 << QVariant(0) // world edge 41 |
415 << QVariant(0) // world edge 41 |
|
416 << QVariant() // scriptparam 42 |
409 ; |
417 ; |
410 |
418 |
411 QList<QVariant> forts; |
419 QList<QVariant> forts; |
412 forts |
420 forts |
413 << predefSchemesNames[7] // name 0 |
421 << predefSchemesNames[7] // name 0 |
450 << QVariant(47) // water rise amt 37 |
458 << QVariant(47) // water rise amt 37 |
451 << QVariant(5) // health dec amt 38 |
459 << QVariant(5) // health dec amt 38 |
452 << QVariant(100) // rope modfier 39 |
460 << QVariant(100) // rope modfier 39 |
453 << QVariant(100) // get away time 40 |
461 << QVariant(100) // get away time 40 |
454 << QVariant(0) // world edge 41 |
462 << QVariant(0) // world edge 41 |
|
463 << QVariant() // scriptparam 42 |
455 ; |
464 ; |
456 |
465 |
457 QList<QVariant> timeless; |
466 QList<QVariant> timeless; |
458 timeless |
467 timeless |
459 << predefSchemesNames[8] // name 0 |
468 << predefSchemesNames[8] // name 0 |
496 << QVariant(0) // water rise amt 37 |
505 << QVariant(0) // water rise amt 37 |
497 << QVariant(0) // health dec amt 38 |
506 << QVariant(0) // health dec amt 38 |
498 << QVariant(100) // rope modfier 39 |
507 << QVariant(100) // rope modfier 39 |
499 << QVariant(100) // get away time 40 |
508 << QVariant(100) // get away time 40 |
500 << QVariant(0) // world edge 41 |
509 << QVariant(0) // world edge 41 |
|
510 << QVariant() // scriptparam 42 |
501 ; |
511 ; |
502 |
512 |
503 QList<QVariant> thinkingportals; |
513 QList<QVariant> thinkingportals; |
504 thinkingportals |
514 thinkingportals |
505 << predefSchemesNames[9] // name 0 |
515 << predefSchemesNames[9] // name 0 |
542 << QVariant(47) // water rise amt 37 |
552 << QVariant(47) // water rise amt 37 |
543 << QVariant(5) // health dec amt 38 |
553 << QVariant(5) // health dec amt 38 |
544 << QVariant(100) // rope modfier 39 |
554 << QVariant(100) // rope modfier 39 |
545 << QVariant(100) // get away time 40 |
555 << QVariant(100) // get away time 40 |
546 << QVariant(0) // world edge 41 |
556 << QVariant(0) // world edge 41 |
|
557 << QVariant() // scriptparam 42 |
547 ; |
558 ; |
548 |
559 |
549 QList<QVariant> kingmode; |
560 QList<QVariant> kingmode; |
550 kingmode |
561 kingmode |
551 << predefSchemesNames[10] // name 0 |
562 << predefSchemesNames[10] // name 0 |
588 << QVariant(47) // water rise amt 37 |
599 << QVariant(47) // water rise amt 37 |
589 << QVariant(5) // health dec amt 38 |
600 << QVariant(5) // health dec amt 38 |
590 << QVariant(100) // rope modfier 39 |
601 << QVariant(100) // rope modfier 39 |
591 << QVariant(100) // get away time 40 |
602 << QVariant(100) // get away time 40 |
592 << QVariant(0) // world edge 41 |
603 << QVariant(0) // world edge 41 |
|
604 << QVariant() // scriptparam 42 |
593 ; |
605 ; |
594 |
606 |
595 |
607 |
596 schemes.append(defaultScheme); |
608 schemes.append(defaultScheme); |
597 schemes.append(proMode); |
609 schemes.append(proMode); |