Merge branch 'dyes' into 'master'

Limit items to a single dye card

See merge request evol/serverdata!258

2 files changed, 84 insertions, 292 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index e2154da9..1dce23e9 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -37,7 +37,7 @@ item_db: (
 	AegisName: "Aegis_Name"       (string)
 	Name: "Item Name"             (string)
 	// ================ Optional fields ===============================
-	Type: Item Type               (string, defaults to "IT_ETC")
+	Type: Item Type               (string, defaults to "IT_ETC"; use "IT_VIRTUAL" for fake items)
 	Buy: Buy Price                (int, defaults to Sell * 2)
 	Sell: Sell Price              (int, defaults to Buy / 2)
 	Weight: Item Weight           (int, defaults to 0)
@@ -155,7 +155,8 @@ item_db: (
 3200    3499      = Neck Armors
 3500    3999      = Weapons
 4000    4999      = Pets
-5000    5999      = Cards
+5000    5499      = Cards
+5500    5999      = Card Groups (using item_group.conf)
 6000    6999      = Bows
 7000    7999      = Arrows
 8000    8499      = LEGACY merge items, generic or usable
@@ -2344,9 +2345,7 @@ item_db: (
 	ViewSprite: 1301
 	BindOnEquip: false
 	AllowCards: {
-		id5000: 1
-		id5001: 1
-		id5002: 1
+		id5500: 1 // BasicSilkDyes
 	}
 },
 {
@@ -2366,25 +2365,7 @@ item_db: (
 	ViewSprite: 1302
 	BindOnEquip: false
 	AllowCards: {
-		id5003: 1
-		id5004: 1
-		id5005: 1
-		id5006: 1
-		id5007: 1
-		id5008: 1
-		id5009: 1
-		id5010: 1
-		id5011: 1
-		id5012: 1
-		id5013: 1
-		id5014: 1
-		id5015: 1
-		id5016: 1
-		id5017: 1
-		id5018: 1
-		id5019: 1
-		id5020: 1
-		id5021: 1
+		id5502: 1 // BasicCottonDyes
 	}
 },
 {
@@ -2480,19 +2461,7 @@ item_db: (
 		bonus bMatk, 30;
 	">
 	AllowCards: {
-		id5000: 1
-		id5001: 1
-		id5002: 1
-		id5034: 1
-		id5035: 1
-		id5036: 1
-		id5037: 1
-		id5038: 1
-		id5039: 1
-		id5040: 1
-		id5041: 1
-		id5042: 1
-		id5043: 1
+		id5501: 1 // ExtendedSilkDyes
 	}
 },
 {
@@ -2512,25 +2481,7 @@ item_db: (
 	ViewSprite: 1308
 	BindOnEquip: false
 	AllowCards: {
-		id5003: 1
-		id5004: 1
-		id5005: 1
-		id5006: 1
-		id5007: 1
-		id5008: 1
-		id5009: 1
-		id5010: 1
-		id5011: 1
-		id5012: 1
-		id5013: 1
-		id5014: 1
-		id5015: 1
-		id5016: 1
-		id5017: 1
-		id5018: 1
-		id5019: 1
-		id5020: 1
-		id5021: 1
+		id5502: 1 // BasicCottonDyes
 	}
 },
 {
@@ -2618,25 +2569,7 @@ item_db: (
 	ViewSprite: 1312
 	BindOnEquip: false
 	AllowCards: {
-		id5003: 1
-		id5004: 1
-		id5005: 1
-		id5006: 1
-		id5007: 1
-		id5008: 1
-		id5009: 1
-		id5010: 1
-		id5011: 1
-		id5012: 1
-		id5013: 1
-		id5014: 1
-		id5015: 1
-		id5016: 1
-		id5017: 1
-		id5018: 1
-		id5019: 1
-		id5020: 1
-		id5021: 1
+		id5502: 1 // BasicCottonDyes
 	}
 },
 {
@@ -2724,25 +2657,7 @@ item_db: (
 	ViewSprite: 1317
 	BindOnEquip: false
 	AllowCards: {
-		id5003: 1
-		id5004: 1
-		id5005: 1
-		id5006: 1
-		id5007: 1
-		id5008: 1
-		id5009: 1
-		id5010: 1
-		id5011: 1
-		id5012: 1
-		id5013: 1
-		id5014: 1
-		id5015: 1
-		id5016: 1
-		id5017: 1
-		id5018: 1
-		id5019: 1
-		id5020: 1
-		id5021: 1
+		id5502: 1 // BasicCottonDyes
 	}
 },
 {
@@ -2883,25 +2798,7 @@ item_db: (
 	ViewSprite: 1801
 	BindOnEquip: false
 	AllowCards: {
-		id5003: 1
-		id5004: 1
-		id5005: 1
-		id5006: 1
-		id5007: 1
-		id5008: 1
-		id5009: 1
-		id5010: 1
-		id5011: 1
-		id5012: 1
-		id5013: 1
-		id5014: 1
-		id5015: 1
-		id5016: 1
-		id5017: 1
-		id5018: 1
-		id5019: 1
-		id5020: 1
-		id5021: 1
+		id5502: 1 // BasicCottonDyes
 	}
 },
 {
@@ -3049,19 +2946,7 @@ item_db: (
 	BindOnEquip: false
 	BuyingStore: true
 	AllowCards: {
-		id5000: 1
-		id5001: 1
-		id5002: 1
-		id5034: 1
-		id5035: 1
-		id5036: 1
-		id5037: 1
-		id5038: 1
-		id5039: 1
-		id5040: 1
-		id5041: 1
-		id5042: 1
-		id5043: 1
+		id5501: 1 // ExtendedSilkDyes
 	}
 },
 {
@@ -3152,25 +3037,7 @@ item_db: (
 	ViewSprite: 2003
 	BindOnEquip: false
 	AllowCards: {
-		id5003: 1
-		id5004: 1
-		id5005: 1
-		id5006: 1
-		id5007: 1
-		id5008: 1
-		id5009: 1
-		id5010: 1
-		id5011: 1
-		id5012: 1
-		id5013: 1
-		id5014: 1
-		id5015: 1
-		id5016: 1
-		id5017: 1
-		id5018: 1
-		id5019: 1
-		id5020: 1
-		id5021: 1
+		id5502: 1 // BasicCottonDyes
 	}
 },
 {
@@ -3277,19 +3144,7 @@ item_db: (
 	ViewSprite: 2009
 	BindOnEquip: false
 	AllowCards: {
-		id5000: 1
-		id5001: 1
-		id5002: 1
-		id5034: 1
-		id5035: 1
-		id5036: 1
-		id5037: 1
-		id5038: 1
-		id5039: 1
-		id5040: 1
-		id5041: 1
-		id5042: 1
-		id5043: 1
+		id5501: 1 // ExtendedSilkDyes
 	}
 },
 
@@ -3365,19 +3220,7 @@ item_db: (
 	ViewSprite: 2203
 	BindOnEquip: false
 	AllowCards: {
-		id5000: 1
-		id5001: 1
-		id5002: 1
-		id5034: 1
-		id5035: 1
-		id5036: 1
-		id5037: 1
-		id5038: 1
-		id5039: 1
-		id5040: 1
-		id5041: 1
-		id5042: 1
-		id5043: 1
+		id5501: 1 // ExtendedSilkDyes
 	}
 },
 {
@@ -3397,25 +3240,7 @@ item_db: (
 	ViewSprite: 2204
 	BindOnEquip: false
 	AllowCards: {
-		id5003: 1
-		id5004: 1
-		id5005: 1
-		id5006: 1
-		id5007: 1
-		id5008: 1
-		id5009: 1
-		id5010: 1
-		id5011: 1
-		id5012: 1
-		id5013: 1
-		id5014: 1
-		id5015: 1
-		id5016: 1
-		id5017: 1
-		id5018: 1
-		id5019: 1
-		id5020: 1
-		id5021: 1
+		id5502: 1 // BasicCottonDyes
 	}
 },
 {
@@ -4046,25 +3871,7 @@ item_db: (
 		noselltonpc: true
 	}
 	AllowCards: {
-		id5003: 1
-		id5004: 1
-		id5005: 1
-		id5006: 1
-		id5007: 1
-		id5008: 1
-		id5009: 1
-		id5010: 1
-		id5011: 1
-		id5012: 1
-		id5013: 1
-		id5014: 1
-		id5015: 1
-		id5016: 1
-		id5017: 1
-		id5018: 1
-		id5019: 1
-		id5020: 1
-		id5021: 1
+		id5502: 1 // BasicCottonDyes
 	}
 },
 {
@@ -4150,25 +3957,7 @@ item_db: (
 	ViewSprite: 2926
 	BindOnEquip: false
 	AllowCards: {
-		id5003: 1
-		id5004: 1
-		id5005: 1
-		id5006: 1
-		id5007: 1
-		id5008: 1
-		id5009: 1
-		id5010: 1
-		id5011: 1
-		id5012: 1
-		id5013: 1
-		id5014: 1
-		id5015: 1
-		id5016: 1
-		id5017: 1
-		id5018: 1
-		id5019: 1
-		id5020: 1
-		id5021: 1
+		id5502: 1 // BasicCottonDyes
 	}
 },
 {
@@ -4190,25 +3979,7 @@ item_db: (
 	ViewSprite: 2927
 	BindOnEquip: false
 	AllowCards: {
-		id5003: 1
-		id5004: 1
-		id5005: 1
-		id5006: 1
-		id5007: 1
-		id5008: 1
-		id5009: 1
-		id5010: 1
-		id5011: 1
-		id5012: 1
-		id5013: 1
-		id5014: 1
-		id5015: 1
-		id5016: 1
-		id5017: 1
-		id5018: 1
-		id5019: 1
-		id5020: 1
-		id5021: 1
+		id5502: 1 // BasicCottonDyes
 	}
 },
 {
@@ -4255,19 +4026,7 @@ item_db: (
 	ViewSprite: 2929
 	BindOnEquip: false
 	AllowCards: {
-		id5000: 1
-		id5001: 1
-		id5002: 1
-		id5034: 1
-		id5035: 1
-		id5036: 1
-		id5037: 1
-		id5038: 1
-		id5039: 1
-		id5040: 1
-		id5041: 1
-		id5042: 1
-		id5043: 1
+		id5501: 1 // ExtendedSilkDyes
 	}
 },
 {
@@ -4289,25 +4048,7 @@ item_db: (
 	ViewSprite: 2930
 	BindOnEquip: false
 	AllowCards: {
-		id5003: 1
-		id5004: 1
-		id5005: 1
-		id5006: 1
-		id5007: 1
-		id5008: 1
-		id5009: 1
-		id5010: 1
-		id5011: 1
-		id5012: 1
-		id5013: 1
-		id5014: 1
-		id5015: 1
-		id5016: 1
-		id5017: 1
-		id5018: 1
-		id5019: 1
-		id5020: 1
-		id5021: 1
+		id5502: 1 // BasicCottonDyes
 	}
 },
 {
@@ -4367,19 +4108,7 @@ item_db: (
 	ViewSprite: 2933
 	BindOnEquip: false
 	AllowCards: {
-		id5000: 1
-		id5001: 1
-		id5002: 1
-		id5034: 1
-		id5035: 1
-		id5036: 1
-		id5037: 1
-		id5038: 1
-		id5039: 1
-		id5040: 1
-		id5041: 1
-		id5042: 1
-		id5043: 1
+		id5501: 1 // ExtendedSilkDyes
 	}
 },
 
@@ -5225,6 +4954,25 @@ item_db: (
 	Sell: 80
 	Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
+// Card Groups (using item_group.conf)
+{
+	Id: 5500
+	AegisName: "BasicSilkDyes"
+	Name: "Basic Silk Dyes"
+	Type: "IT_VIRTUAL"
+},
+{
+	Id: 5501
+	AegisName: "ExtendedSilkDyes"
+	Name: "Extended Silk Dyes"
+	Type: "IT_VIRTUAL"
+},
+{
+	Id: 5502
+	AegisName: "BasicCottonDyes"
+	Name: "Basic Cotton Dyes"
+	Type: "IT_VIRTUAL"
+},
 // Bows
 {
 	Id: 6000
diff --git a/db/re/item_group.conf b/db/re/item_group.conf
index e6351128..a1fffa25 100644
--- a/db/re/item_group.conf
+++ b/db/re/item_group.conf
@@ -17,3 +17,47 @@
 	("Item_Name",Repeat_Count)
 )
 */
+
+BasicSilkDyes: (
+	"PitchBlackSilkDye",
+	"ChocolateSilkDye",
+	"CrimsonSilkDye",
+)
+
+ExtendedSilkDyes: (
+	"PitchBlackSilkDye",
+	"ChocolateSilkDye",
+	"CrimsonSilkDye",
+	"TomatoSilkDye",
+	"GoldenrodSilkDye",
+	"SunflowerSilkDye",
+	"OliveSilkDye",
+	"SeaGreenSilkDye",
+	"MintSilkDye",
+	"MidnightBlueSilkDye",
+	"SlatBlueSilkDye",
+	"OrchidSilkDye",
+	"PinkiePinkSilkDye",
+)
+
+BasicCottonDyes: (
+	"BlackCottonDye",
+	"SilverCottonDye",
+	"CamelCottonDye",
+	"BrownCottonDye",
+	"OrangeCottonDye",
+	"DarkRedCottonDye",
+	"RedCottonDye",
+	"FuschiaCottonDye",
+	"PinkCottonDye",
+	"MauveCottonDye",
+	"PurpleCottonDye",
+	"NavyBlueCottonDye",
+	"BlueGrayCottonDye",
+	"BlueCottonDye",
+	"TealCottonDye",
+	"GreenCottonDye",
+	"LimeCottonDye",
+	"KhakiCottonDye",
+	"YellowCottonDye",
+)