# HG changeset patch # User Wuzzy # Date 1492236563 -7200 # Node ID 41af2274953d9480a665192e4988b15709d5d048 # Parent b46b4ec17f8ce314e92c9600ca647aef67d0f00d Add HedgeEditor schemes as recommended on https://hedgewars.org/HedgeEditor diff -r b46b4ec17f8c -r 41af2274953d QTfrontend/hwconsts.cpp.in --- a/QTfrontend/hwconsts.cpp.in Sat Apr 15 07:12:11 2017 +0200 +++ b/QTfrontend/hwconsts.cpp.in Sat Apr 15 08:09:23 2017 +0200 @@ -72,12 +72,15 @@ << qMakePair(QString("Highlander"), QString( AMMOLINE_HIGHLANDER_QT AMMOLINE_HIGHLANDER_PROB AMMOLINE_HIGHLANDER_DELAY AMMOLINE_HIGHLANDER_CRATE )) - << qMakePair(QString("Construction Mode"), QString( + << qMakePair(QString("Construction Mode"), QString( AMMOLINE_CONSTRUCTION_QT AMMOLINE_CONSTRUCTION_PROB AMMOLINE_CONSTRUCTION_DELAY AMMOLINE_CONSTRUCTION_CRATE )) - << qMakePair(QString("Shoppa Pro"), QString( + << qMakePair(QString("Shoppa Pro"), QString( AMMOLINE_SHOPPAPRO_QT AMMOLINE_SHOPPAPRO_PROB AMMOLINE_SHOPPAPRO_DELAY AMMOLINE_SHOPPAPRO_CRATE )) + << qMakePair(QString("HedgeEditor"), QString( + AMMOLINE_HEDGEEDITOR_QT AMMOLINE_HEDGEEDITOR_PROB + AMMOLINE_HEDGEEDITOR_DELAY AMMOLINE_HEDGEEDITOR_CRATE )) ; unsigned int colors[] = HW_TEAMCOLOR_ARRAY; diff -r b46b4ec17f8c -r 41af2274953d QTfrontend/model/ammoSchemeModel.cpp --- a/QTfrontend/model/ammoSchemeModel.cpp Sat Apr 15 07:12:11 2017 +0200 +++ b/QTfrontend/model/ammoSchemeModel.cpp Sat Apr 15 08:09:23 2017 +0200 @@ -84,7 +84,8 @@ << "Timeless" << "Thinking with Portals" << "King Mode" - << "Construction Mode" + << "Construction Mode" + << "HedgeEditor" ; numberOfDefaultSchemes = predefSchemesNames.size(); @@ -615,6 +616,56 @@ << QVariant(0) // world edge 42 << QVariant() // scriptparam 43 ; + + QList hedgeeditor; + hedgeeditor + << predefSchemesNames[11] // 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(false) // 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(true) // per hog ammo 21 + << QVariant(false) // no wind 22 + << QVariant(false) // more wind 23 + << QVariant(false) // tag team 24 + << QVariant(false) // bottom border 25 + << QVariant(100) // damage modfier 26 + << QVariant(9999) // turn time 27 + << QVariant(100) // init health 28 + << QVariant(50) // sudden death 29 + << QVariant(5) // case prob 30 + << QVariant(3) // mines time 31 + << QVariant(0) // mines number 32 + << QVariant(0) // mine dud pct 33 + << QVariant(0) // explosives 34 + << QVariant(0) // air mines 35 + << QVariant(35) // health case pct 36 + << QVariant(25) // health case amt 37 + << QVariant(0) // water rise amt 38 + << QVariant(0) // health dec amt 39 + << QVariant(100) // rope modfier 40 + << QVariant(100) // get away time 41 + << QVariant(0) // world edge 42 + << QVariant() // scriptparam 43 + ; + + schemes.append(defaultScheme); schemes.append(proMode); @@ -626,7 +677,8 @@ schemes.append(timeless); schemes.append(thinkingportals); schemes.append(kingmode); - schemes.append(construction); + schemes.append(construction); + schemes.append(hedgeeditor); int size = fileConfig.beginReadArray("schemes"); diff -r b46b4ec17f8c -r 41af2274953d QTfrontend/weapons.h --- a/QTfrontend/weapons.h Sat Apr 15 07:12:11 2017 +0200 +++ b/QTfrontend/weapons.h Sat Apr 15 08:09:23 2017 +0200 @@ -138,3 +138,7 @@ #define AMMOLINE_SHOPPAPRO_DELAY "0000000000000000000000000000000000000000000000000000000000" #define AMMOLINE_SHOPPAPRO_CRATE "1111110111111111111111111111111111111111111111111111121111" +#define AMMOLINE_HEDGEEDITOR_QT "0000009000000000000000000000000000000000000000000000000000" +#define AMMOLINE_HEDGEEDITOR_PROB "0000000000000000000000000000000000000000000000000000000000" +#define AMMOLINE_HEDGEEDITOR_DELAY "0000000000000000000000000000000000000000000000000000000000" +#define AMMOLINE_HEDGEEDITOR_CRATE "1111110111111111111111111111111111111111111111111111111111" diff -r b46b4ec17f8c -r 41af2274953d share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.cfg --- a/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.cfg Sat Apr 15 07:12:11 2017 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.cfg Sat Apr 15 08:09:23 2017 +0200 @@ -1,2 +1,2 @@ -Default -Default +HedgeEditor +HedgeEditor