adding & editing custom pack types now works.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1328 0fc631ac-6414-0410-93d0-97cfa31319b6

src/data/action/set.cpp

@@ -10,11 +10,13 @@
 #include <data/action/set.hpp>
 #include <data/set.hpp>
 #include <data/card.hpp>
+#include <data/pack.hpp>
 #include <data/stylesheet.hpp>
 #include <util/error.hpp>
 
 DECLARE_TYPEOF_COLLECTION(IndexMap<FieldP COMMA ValueP>);
 DECLARE_TYPEOF_COLLECTION(CardP);
+DECLARE_TYPEOF_COLLECTION(PackTypeP);
 DECLARE_TYPEOF_COLLECTION(int);
 
 // ----------------------------------------------------------------------------- : Add card
@@ -135,3 +137,32 @@ void ChangeCardHasStylingAction::perform(bool to_undo) {
 	card->has_styling = !card->has_styling;
 	swap(card->styling_data, styling_data);
 }
+
+// ----------------------------------------------------------------------------- : Pack types
+
+AddPackAction::AddPackAction(AddingOrRemoving ar, Set& set, const PackTypeP& pack)
+	: PackTypesAction(set)
+	, action(ar, pack, set.pack_types)
+{}
+
+String AddPackAction::getName(bool to_undo) const {
+	return action.getName();
+}
+
+void AddPackAction::perform(bool to_undo) {
+	action.perform(set.pack_types, to_undo);
+}
+
+
+ChangePackAction::ChangePackAction(Set& set, size_t pos, const PackTypeP& pack)
+	: PackTypesAction(set)
+	, pos(pos), pack(pack)
+{}
+
+String ChangePackAction::getName(bool to_undo) const {
+	return _ACTION_1_("change",type_name(pack));
+}
+
+void ChangePackAction::perform(bool to_undo) {
+	swap(set.pack_types.at(pos), pack);
+}

src/data/action/set.hpp

@@ -23,7 +23,9 @@ DECLARE_POINTER_TYPE(Card);
 DECLARE_POINTER_TYPE(StyleSheet);
 DECLARE_POINTER_TYPE(Field);
 DECLARE_POINTER_TYPE(Value);
+DECLARE_POINTER_TYPE(PackType);
 DECLARE_TYPEOF_COLLECTION(GenericAddAction<CardP>::Step);
+DECLARE_TYPEOF_COLLECTION(GenericAddAction<PackTypeP>::Step);
 
 // ----------------------------------------------------------------------------- : Add card
 
@@ -119,5 +121,43 @@ class ChangeCardHasStylingAction : public DisplayChangeAction {
 	IndexMap<FieldP,ValueP> styling_data; ///< The old styling of the card
 };
 
+// ----------------------------------------------------------------------------- : Pack types
+
+/// An Action the changes the pack types of a set
+class PackTypesAction : public Action {
+  public:
+	inline PackTypesAction(Set& set) : set(set) {}
+	
+  protected:
+	Set& set; // the set owns this action, so the set will not be destroyed before this
+	          // therefore we don't need a smart pointer
+};
+
+/// Adding/removing a pack from a Set
+class AddPackAction : public PackTypesAction {
+  public:
+	/// Add a newly allocated card
+	AddPackAction(AddingOrRemoving, Set& set, const PackTypeP& pack);
+	
+	virtual String getName(bool to_undo) const;
+	virtual void   perform(bool to_undo);
+	
+	const GenericAddAction<PackTypeP> action;
+};
+
+/// Updating a pack in a Set
+class ChangePackAction : public PackTypesAction {
+  public:
+	/// Add a newly allocated card
+	ChangePackAction(Set& set, size_t pos, const PackTypeP& new_pack);
+	
+	virtual String getName(bool to_undo) const;
+	virtual void   perform(bool to_undo);
+	
+  private:
+	PackTypeP pack;
+	size_t    pos;
+};
+
 // ----------------------------------------------------------------------------- : EOF
 #endif

src/data/game.cpp

@@ -55,7 +55,7 @@ IMPLEMENT_REFLECTION(Game) {
 	REFLECT_NO_SCRIPT(statistics_dimensions);
 	REFLECT_NO_SCRIPT(statistics_categories);
   #if USE_NEW_PACK_SYSTEM
-	REFLECT_ALIAS(307, "pack item", "pack type");
+	REFLECT_ALIAS(308, "pack item", "pack type");
   #else
 	REFLECT_NO_SCRIPT(pack_items);
   #endif

src/data/pack.cpp

@@ -454,6 +454,13 @@ PackInstance& PackGenerator::get(const String& name) {
 	if (instance) {
 		return *instance;
 	} else {
+		FOR_EACH_CONST(type, set->pack_types) {
+			if (type->name == name) {
+				instance = PackInstanceP(new PackInstance(*type,*this));
+				max_depth = max(max_depth, instance->get_depth());
+				return *instance;
+			}
+		}
 		FOR_EACH_CONST(type, set->game->pack_types) {
 			if (type->name == name) {
 				instance = PackInstanceP(new PackInstance(*type,*this));
@@ -481,6 +488,13 @@ void PackGenerator::generate(vector<CardP>& out) {
 				i.generate(&out);
 			}
 		}
+		// ...and then set file order
+		FOR_EACH_CONST(type, set->pack_types) {
+			PackInstance& i = get(type);
+			if (i.get_depth() == depth) {
+				i.generate(&out);
+			}
+		}
 	}
 }
 

src/data/pack.hpp

@@ -166,6 +166,9 @@ class PackItem : public IntrusivePtrBase<PackItem> {
 	DECLARE_REFLECTION();
 };
 
+inline String type_name(const PackType&) {
+	return _TYPE_("pack");
+}
 
 // ----------------------------------------------------------------------------- : Generating / counting
 

src/data/set.cpp

@@ -181,6 +181,7 @@ IMPLEMENT_REFLECTION(Set) {
 		}
 		REFLECT(cards);
 		REFLECT(keywords);
+		REFLECT(pack_types);
 	}
 	reflect_set_info_get_member(tag,data);
 	REFLECT(apprentice_code);

src/data/set.hpp

@@ -25,6 +25,7 @@ DECLARE_POINTER_TYPE(Styling);
 DECLARE_POINTER_TYPE(Field);
 DECLARE_POINTER_TYPE(Value);
 DECLARE_POINTER_TYPE(Keyword);
+DECLARE_POINTER_TYPE(PackType);
 DECLARE_POINTER_TYPE(ScriptValue);
 class SetScriptManager;
 class SetScriptContext;
@@ -45,19 +46,21 @@ class Set : public Packaged {
 	/// Create a set using the given stylesheet, and its game
 	Set(const StyleSheetP& stylesheet);
 	~Set();
-  
-	GameP game;					///< The game this set uses
-	StyleSheetP stylesheet;		///< The default stylesheet
+
+	GameP                    game;              ///< The game this set uses
+	StyleSheetP              stylesheet;        ///< The default stylesheet
 	/// The values on the fields of the set
 	/** The indices should correspond to the set_fields in the Game */
 	IndexMap<FieldP, ValueP> data;
 	/// Extra values for specitic stylesheets, indexed by stylesheet name
 	DelayedIndexMaps<FieldP,ValueP> styling_data;
-	vector<CardP> cards;		///< The cards in the set
-	vector<KeywordP> keywords;	///< Additional keywords used in this set
-	String apprentice_code;		///< Code to use for apprentice (Magic only)
-	ActionStack actions;		///< Actions performed on this set and the cards in it
-	KeywordDatabase keyword_db;	///< Database for matching keywords, must be cleared when keywords change
+	vector<CardP>            cards;             ///< The cards in the set
+	vector<KeywordP>         keywords;          ///< Additional keywords used in this set
+	vector<PackTypeP>        pack_types;        ///< Additional/replacement pack types
+	String                   apprentice_code;   ///< Code to use for apprentice (Magic only)
+
+	ActionStack              actions;           ///< Actions performed on this set and the cards in it
+	KeywordDatabase          keyword_db;        ///< Database for matching keywords, must be cleared when keywords change
 	
 	/// A context for performing scripts
 	/** Should only be used from the main thread! */