Added CustomPackDialog for user constructed PackTypes.

There is no UI for using these custom types yet.

src/data/pack.cpp

@@ -190,6 +190,10 @@ IMPLEMENT_REFLECTION(PackType) {
 			if (filter)              select = SELECT_NO_REPLACE;
 			else if (!items.empty()) select = SELECT_ALL;
 		}
+		if (indeterminate(summary)) {
+			if (filter)              summary = true;
+			else if (!items.empty()) summary = false;
+		}
 		if (indeterminate(selectable)) {
 			if (filter)              selectable = false;
 			else if (!items.empty()) selectable = true;
@@ -211,12 +215,19 @@ IMPLEMENT_REFLECTION(PackItem) {
 PackType::PackType()
 	: enabled(true)
 	, selectable(indeterminate)
-	, summary(true)
+	, summary(indeterminate)
 	, select(SELECT_AUTO)
 {}
 
 PackItem::PackItem()
 	: amount(1)
+	, probability(1)
+{}
+
+PackItem::PackItem(const String& name, int amount)
+	: name(name)
+	, amount(amount)
+	, probability(1)
 {}
 
 
@@ -380,7 +391,7 @@ void PackInstance::generate(vector<CardP>* out) {
 	} else if (pack_type.select == SELECT_NO_REPLACE) {
 		card_copies += requested_copies;
 		// NOTE: there is no way to pick items without replacement
-		if (out) {
+		if (out && !cards.empty()) {
 			// to prevent us from being too predictable for small sets, periodically reshuffle
 			RandomRange<boost::mt19937> gen_range(parent.gen);
 			int max_per_batch = ((int)cards.size() + 1) / 2;
@@ -394,7 +405,7 @@ void PackInstance::generate(vector<CardP>* out) {
 		
 	} else if (pack_type.select == SELECT_CYCLIC) {
 		size_t total = cards.size() + pack_type.items.size();
-		if (total <= 0) total = 1; // prevent div by 0
+		if (total == 0) return; // prevent div by 0
 		size_t div = requested_copies / total;
 		size_t rem = requested_copies % total;
 		for (size_t i = 0 ; i < total ; ++i) {

src/data/pack.hpp

@@ -137,7 +137,7 @@ class PackType : public IntrusivePtrBase<PackType> {
 	String            name;       ///< Name of this pack
 	Scriptable<bool>  enabled;    ///< Is this pack enabled?
 	tribool           selectable; ///< Is this pack listed in the UI?
-	bool              summary;    ///< Should the total be listed for this type?
+	tribool           summary;    ///< Should the total be listed for this type?
 	PackSelectType    select;     ///< What cards/items to select
 	OptionalScript    filter;     ///< Filter to select this type of cards
 	vector<PackItemP> items;      ///< Subpacks in this pack
@@ -153,6 +153,7 @@ class PackType : public IntrusivePtrBase<PackType> {
 class PackItem : public IntrusivePtrBase<PackItem> {
   public:
 	PackItem();
+	PackItem(const String& name, int amount);
 	
 	String             name;         ///< Name of the pack to select cards from
 	Scriptable<int>    amount;       ///< Number of cards of this type

src/gui/set/random_pack_panel.hpp

@@ -20,6 +20,19 @@ class PackTotalsPanel;
 struct CardSelectEvent;
 DECLARE_POINTER_TYPE(PackType);
 
+// ----------------------------------------------------------------------------- : Utility
+
+// for lists of spin controls
+struct PackAmountPicker {
+	PackTypeP     pack;
+	wxStaticText* label;
+	wxSpinCtrl*   value;
+	
+	PackAmountPicker() {}
+	PackAmountPicker(wxWindow* parent, wxFlexGridSizer* sizer, const PackTypeP& pack);
+	void destroy(wxFlexGridSizer* sizer);
+};
+
 // ----------------------------------------------------------------------------- : RandomPackPanel
 
 /// A SetWindowPanel for creating random booster packs
@@ -59,16 +72,11 @@ class RandomPackPanel : public SetWindowPanel {
 	wxButton*         generate_button;
 	wxRadioButton*    seed_random, *seed_fixed;
 	PackTotalsPanel*  totals;
-	
-	struct PackItem {
-		PackTypeP     pack;
-		wxStaticText* label;
-		wxSpinCtrl*   value;
-	};
-	vector<PackItem> packs;
+	vector<PackAmountPicker> pickers;
 	
 	#if USE_NEW_PACK_SYSTEM
 		PackGenerator generator;
+		int last_seed;
 	#endif
 	
 	/// Actual intialization of the controls

src/util/window_id.hpp

@@ -201,6 +201,7 @@ enum ChildMenuID {
 ,	ID_SEED_RANDOM
 ,	ID_SEED_FIXED
 ,	ID_GENERATE_PACK
+,	ID_CUSTOM_PACK
 	
 	// SymbolFont (Format menu)
 ,	ID_INSERT_SYMBOL_MENU_MIN =  9001