Merge branch 'savior_dye' into 'master'

Dyable Savior Armor

See merge request legacy/serverdata!678

7 files changed, 247 insertions, 2 deletions

diff --git a/client-data b/client-data
-Subproject 4c8a1b8e845abd5f20a0a2b61b8dd1ceb17867b
+Subproject f1a07568ab235296833e191e17935463ea0ee30
diff --git a/tools b/tools
-Subproject 22ce3fd72b46c4675d82fa4b35fa24b8f22bd2d
+Subproject a5d6818c8e4f68d9b7dd6272754a781c90be3f8
diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index ecf5f3b6..d5eb76ac 100644
--- a/world/map/db/const-aegis.txt
+++ b/world/map/db/const-aegis.txt
@@ -350,6 +350,7 @@ CrystallizedDragonBlood 5293
 PinkFlowerSeed 5295
 SilverIngot 5296
 GoldenTooth 5297
+CloverDrawing 5298
 LeatherShirt 523
 DesertShirt 546
 Turtleneck 564
@@ -586,6 +587,16 @@ PurpleContributor 5139
 DarkGreenContributor 5140
 SaviorArmor 5254
 RedArmor 5286
+RedSaviorArmor 5299
+GreenSaviorArmor 5300
+DarkBlueSaviorArmor 5301
+YellowSaviorArmor 5302
+LightBlueSaviorArmor 5303
+PinkSaviorArmor 5304
+BlackSaviorArmor 5305
+OrangeSaviorArmor 5306
+PurpleSaviorArmor 5307
+DarkGreenSaviorArmor 5308
 SantaHat 511
 FancyHat 524
 MinersHat 525
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index 73be52d0..7845b1c4 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -5309,6 +5309,28 @@ item_db: (
 	Refine: false
 	ViewSprite: 5297
 },
+{
+	Id: 5298
+	AegisName: "CloverDrawing"
+	Name: "Clover Drawing"
+	Type: "IT_ETC"
+	Buy: 0
+	Sell: 0
+	Weight: 10
+	Def: 0
+	Refine: false
+	ViewSprite: 5298
+	Trade: {
+		notrade: true
+		nodrop: true
+		nostorage: false
+		nogstorage: false
+		nomail: true
+		noauction: true
+		noselltonpc: true
+	}
+	//Disabled: true // @TMWA
+},
 /* Chest Armor */
 {
 	Id: 523
@@ -9665,6 +9687,206 @@ item_db: (
 		override: 1
 	}
 },
+{
+	Id: 5299
+	AegisName: "RedSaviorArmor"
+	Name: "RedSaviorArmor"
+	Type: "IT_ARMOR"
+	Buy: 0
+	Sell: 0
+	Weight: 2000
+	Matk: -90
+	Def: 24
+	Slots: 0
+	Loc: "EQP_HEAD_MID"
+	Refine: false
+	ViewSprite: 5299
+	Script: <"
+		bonus bMatkRate, -90; // @EVOL2
+		bonus bDex, 1;
+		bonus bMaxHP, 100;
+	">
+},
+{
+	Id: 5300
+	AegisName: "GreenSaviorArmor"
+	Name: "GreenSaviorArmor"
+	Type: "IT_ARMOR"
+	Buy: 0
+	Sell: 0
+	Weight: 2000
+	Matk: -90
+	Def: 24
+	Slots: 0
+	Loc: "EQP_HEAD_MID"
+	Refine: false
+	ViewSprite: 5300
+	Script: <"
+		bonus bMatkRate, -90; // @EVOL2
+		bonus bDex, 1;
+		bonus bMaxHP, 100;
+	">
+},
+{
+	Id: 5301
+	AegisName: "DarkBlueSaviorArmor"
+	Name: "DarkBlueSaviorArmor"
+	Type: "IT_ARMOR"
+	Buy: 0
+	Sell: 0
+	Weight: 2000
+	Matk: -90
+	Def: 24
+	Slots: 0
+	Loc: "EQP_HEAD_MID"
+	Refine: false
+	ViewSprite: 5301
+	Script: <"
+		bonus bMatkRate, -90; // @EVOL2
+		bonus bDex, 1;
+		bonus bMaxHP, 100;
+	">
+},
+{
+	Id: 5302
+	AegisName: "YellowSaviorArmor"
+	Name: "YellowSaviorArmor"
+	Type: "IT_ARMOR"
+	Buy: 0
+	Sell: 0
+	Weight: 2000
+	Matk: -90
+	Def: 24
+	Slots: 0
+	Loc: "EQP_HEAD_MID"
+	Refine: false
+	ViewSprite: 5302
+	Script: <"
+		bonus bMatkRate, -90; // @EVOL2
+		bonus bDex, 1;
+		bonus bMaxHP, 100;
+	">
+},
+{
+	Id: 5303
+	AegisName: "LightBlueSaviorArmor"
+	Name: "LightBlueSaviorArmor"
+	Type: "IT_ARMOR"
+	Buy: 0
+	Sell: 0
+	Weight: 2000
+	Matk: -90
+	Def: 24
+	Slots: 0
+	Loc: "EQP_HEAD_MID"
+	Refine: false
+	ViewSprite: 5303
+	Script: <"
+		bonus bMatkRate, -90; // @EVOL2
+		bonus bDex, 1;
+		bonus bMaxHP, 100;
+	">
+},
+{
+	Id: 5304
+	AegisName: "PinkSaviorArmor"
+	Name: "PinkSaviorArmor"
+	Type: "IT_ARMOR"
+	Buy: 0
+	Sell: 0
+	Weight: 2000
+	Matk: -90
+	Def: 24
+	Slots: 0
+	Loc: "EQP_HEAD_MID"
+	Refine: false
+	ViewSprite: 5304
+	Script: <"
+		bonus bMatkRate, -90; // @EVOL2
+		bonus bDex, 1;
+		bonus bMaxHP, 100;
+	">
+},
+{
+	Id: 5305
+	AegisName: "BlackSaviorArmor"
+	Name: "BlackSaviorArmor"
+	Type: "IT_ARMOR"
+	Buy: 0
+	Sell: 0
+	Weight: 2000
+	Matk: -90
+	Def: 24
+	Slots: 0
+	Loc: "EQP_HEAD_MID"
+	Refine: false
+	ViewSprite: 5305
+	Script: <"
+		bonus bMatkRate, -90; // @EVOL2
+		bonus bDex, 1;
+		bonus bMaxHP, 100;
+	">
+},
+{
+	Id: 5306
+	AegisName: "OrangeSaviorArmor"
+	Name: "OrangeSaviorArmor"
+	Type: "IT_ARMOR"
+	Buy: 0
+	Sell: 0
+	Weight: 2000
+	Matk: -90
+	Def: 24
+	Slots: 0
+	Loc: "EQP_HEAD_MID"
+	Refine: false
+	ViewSprite: 5306
+	Script: <"
+		bonus bMatkRate, -90; // @EVOL2
+		bonus bDex, 1;
+		bonus bMaxHP, 100;
+	">
+},
+{
+	Id: 5307
+	AegisName: "PurpleSaviorArmor"
+	Name: "PurpleSaviorArmor"
+	Type: "IT_ARMOR"
+	Buy: 0
+	Sell: 0
+	Weight: 2000
+	Matk: -90
+	Def: 24
+	Slots: 0
+	Loc: "EQP_HEAD_MID"
+	Refine: false
+	ViewSprite: 5307
+	Script: <"
+		bonus bMatkRate, -90; // @EVOL2
+		bonus bDex, 1;
+		bonus bMaxHP, 100;
+	">
+},
+{
+	Id: 5308
+	AegisName: "DarkGreenSaviorArmor"
+	Name: "DarkGreenSaviorArmor"
+	Type: "IT_ARMOR"
+	Buy: 0
+	Sell: 0
+	Weight: 2000
+	Matk: -90
+	Def: 24
+	Slots: 0
+	Loc: "EQP_HEAD_MID"
+	Refine: false
+	ViewSprite: 5308
+	Script: <"
+		bonus bMatkRate, -90; // @EVOL2
+		bonus bDex, 1;
+		bonus bMaxHP, 100;
+	">
+},
 //////////////////////////////////////////////////////////
 // Hats
 {
diff --git a/world/map/db/item_db_chest.txt b/world/map/db/item_db_chest.txt
index 68ce8289..7212fed6 100644
--- a/world/map/db/item_db_chest.txt
+++ b/world/map/db/item_db_chest.txt
@@ -249,3 +249,14 @@
 5140,   DarkGreenContributor,   5,      0,          0,          20,         0,      5,      0,      5,      0,      2,      512,        0,      0,      0,      0,      {},                                                                     {}
 5254,   SaviorArmor,            5,      0,          0,          2000,       0,      24,     0,      -90,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {bonus bDex, 1; bonus bMaxHP, 100;}
 5286,   RedArmor,               5,      0,          0,          2000,       0,      27,     0,      -40,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {callfunc "RestrictedItem"; bonus bDex, 1; bonus bAgi, 1; bonus bMaxHP, 1500;}
+5299,   RedSaviorArmor,         5,      0,          0,          2000,       0,      24,     0,      -90,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {bonus bDex, 1; bonus bMaxHP, 100;}
+5300,   GreenSaviorArmor,       5,      0,          0,          2000,       0,      24,     0,      -90,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {bonus bDex, 1; bonus bMaxHP, 100;}
+5301,   DarkBlueSaviorArmor,    5,      0,          0,          2000,       0,      24,     0,      -90,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {bonus bDex, 1; bonus bMaxHP, 100;}
+5302,   YellowSaviorArmor,      5,      0,          0,          2000,       0,      24,     0,      -90,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {bonus bDex, 1; bonus bMaxHP, 100;}
+//ID,   Name,                   Type,   Price,      Sell,       Weight,     ATK,    DEF,    Range,  Mbonus, Slot,   Gender, Loc,        wLV,    eLV,    View,   Mode,   {UseScript},                                                            {EquipScript}
+5303,   LightBlueSaviorArmor,   5,      0,          0,          2000,       0,      24,     0,      -90,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {bonus bDex, 1; bonus bMaxHP, 100;}
+5304,   PinkSaviorArmor,        5,      0,          0,          2000,       0,      24,     0,      -90,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {bonus bDex, 1; bonus bMaxHP, 100;}
+5305,   BlackSaviorArmor,       5,      0,          0,          2000,       0,      24,     0,      -90,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {bonus bDex, 1; bonus bMaxHP, 100;}
+5306,   OrangeSaviorArmor,      5,      0,          0,          2000,       0,      24,     0,      -90,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {bonus bDex, 1; bonus bMaxHP, 100;}
+5307,   PurpleSaviorArmor,      5,      0,          0,          2000,       0,      24,     0,      -90,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {bonus bDex, 1; bonus bMaxHP, 100;}
+5308,   DarkGreenSaviorArmor,   5,      0,          0,          2000,       0,      24,     0,      -90,    0,      2,      512,        0,      0,      0,      0,      {},                                                                     {bonus bDex, 1; bonus bMaxHP, 100;}
diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt
index 45a03bf2..d9bc9567 100644
--- a/world/map/db/item_db_generic.txt
+++ b/world/map/db/item_db_generic.txt
@@ -269,3 +269,4 @@
 //5295, PinkFlowerSeed,         3,      0,          0,          10,         0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      7,      {},                                                                     {}
 //5296, SilverIngot,            3,      20000,      2200,       1000,       0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      7,      {},                                                                     {}
 5297,   GoldenTooth,            3,      20000,      2000,       40,         0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      0,      {},                                                                     {}
+//5298, CloverDrawing,          3,      0,          0,          10,         0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      7,      {},                                                                     {}
diff --git a/world/map/npc/functions/DyeConfig.txt b/world/map/npc/functions/DyeConfig.txt
index 999f6722..4c4ba8cc 100644
--- a/world/map/npc/functions/DyeConfig.txt
+++ b/world/map/npc/functions/DyeConfig.txt
@@ -8,8 +8,8 @@ OnInit:
     setarray $@DYE_color_names$, "Red", "Green", "Dark Blue", "Yellow", "Light blue", "Pink", "Black", "Orange", "Purple", "Dark Green";
     setarray $@DYE_colors$,      "Red", "Green", "DarkBlue",  "Yellow", "LightBlue",  "Pink", "Black", "Orange", "Purple", "DarkGreen";
 
-    setarray $@DYE_items$,      "Beret", "CottonShirt",  "CottonCloth",  "VNeckSweater",   "Turtleneck",         "CottonShorts",  "CottonTrousers",  "CottonSkirt",  "Miniskirt", "TankTop",  "ShortTankTop",   "SilkRobe",  "CottonHeadband",  "DesertHat",  "CottonBoots",  "CottonGloves",  "RabbitEars",  "WizardHat",  "BowlerHat",  "BowlerHatBrown",     "FineDress",  "Contributor",       "SorcererRed",         "SorcererGreen",         "SorcererDBlue",             "SorcererYellow",         "SorcererLBlue",              "SorcererPink",         "SorcererBlack",         "SorcererOrange",         "SorcererPurple",         "SorcererDGreen",             "SorcererWhite";
-    setarray $@DYE_item_names$, "Beret", "Cotton Shirt", "Cotton Cloth", "V-Neck Sweater", "Turtleneck Sweater", "Cotton Shorts", "Cotton Trousers", "Cotton Skirt", "Miniskirt", "Tank Top", "Short Tank Top", "Silk Robe", "Cotton Headband", "Desert Hat", "Cotton Boots", "Cotton Gloves", "Rabbit Ears", "Wizard Hat", "Bowler Hat", "Bowler Hat (brown)", "Fine Dress", "Contributor Shirt", "Sorcerer Robe (Red)", "Sorcerer Robe (Green)", "Sorcerer Robe (Dark Blue)", "Sorcerer Robe (Yellow)", "Sorcerer Robe (Light Blue)", "Sorcerer Robe (Pink)", "Sorcerer Robe (Black)", "Sorcerer Robe (Orange)", "Sorcerer Robe (Purple)", "Sorcerer Robe (Dark Green)", "Sorcerer Robe (White)";
+    setarray $@DYE_items$,      "Beret", "CottonShirt",  "CottonCloth",  "VNeckSweater",   "Turtleneck",         "CottonShorts",  "CottonTrousers",  "CottonSkirt",  "Miniskirt", "TankTop",  "ShortTankTop",   "SilkRobe",  "CottonHeadband",  "DesertHat",  "CottonBoots",  "CottonGloves",  "RabbitEars",  "WizardHat",  "BowlerHat",  "BowlerHatBrown",     "FineDress",  "Contributor",       "SorcererRed",         "SorcererGreen",         "SorcererDBlue",             "SorcererYellow",         "SorcererLBlue",              "SorcererPink",         "SorcererBlack",         "SorcererOrange",         "SorcererPurple",         "SorcererDGreen",             "SorcererWhite",          "SaviorArmor";
+    setarray $@DYE_item_names$, "Beret", "Cotton Shirt", "Cotton Cloth", "V-Neck Sweater", "Turtleneck Sweater", "Cotton Shorts", "Cotton Trousers", "Cotton Skirt", "Miniskirt", "Tank Top", "Short Tank Top", "Silk Robe", "Cotton Headband", "Desert Hat", "Cotton Boots", "Cotton Gloves", "Rabbit Ears", "Wizard Hat", "Bowler Hat", "Bowler Hat (brown)", "Fine Dress", "Contributor Shirt", "Sorcerer Robe (Red)", "Sorcerer Robe (Green)", "Sorcerer Robe (Dark Blue)", "Sorcerer Robe (Yellow)", "Sorcerer Robe (Light Blue)", "Sorcerer Robe (Pink)", "Sorcerer Robe (Black)", "Sorcerer Robe (Orange)", "Sorcerer Robe (Purple)", "Sorcerer Robe (Dark Green)", "Sorcerer Robe (White)" , "Savior Armor";
     /******************************
         Config Ends Here
     ******************************/