=General

*Changed a few settings in the client.conf file to new defaults.
+max_hair_style changed from 29 to 31. (July 2018 client or higher needed)
+max_doram_cloth_color changed from 0 to 3. (July 2018 client or higher needed)
+save_body_style changed from no to yes.
-Note: Body style's will now be saved by default from here on since the alternate
-3rd job outfits are now officially released in kRO. Make sure your kRO and RE
-client data is up-to-date to prevent errors.

*bCooldownRate
*bNoMadoFuel
+Added support for these bonuses.

*Fixed a issue where bonus and bonus2 for fixedcastrate stacked.
-Only the highest percentage should be taken.

*Burning status now reduces MDEF by 25%.

*Frost status no longer increases variable cast time.
+Now increases fixed cast time by 50%.



=Database
*Corrected some equips that were usable by Star Emperor and Soul Reaper jobs
-that should not be usable by those jobs.

*Added the "Costume Change Ticket" item.

*Added body style support to the mob_avail file.

*The packet_db now shows the 2018-06-21aRagexeRE client can be used.
-It uses the same exact packets as the 2018-06-20eRagexeRE.



=Documents
*Updated item_bonus file to show how to use the new bonuses.



=Skills
*Star Emperor
*Soul Reaper
+Updated the status's given by their skills for dispell/clearance rules.

*TK_JUMPKICK
+No longer removes soul reaper soul links.

*AB_CLEARANCE
+Can now be used on Soul Linker / Soul Reaper jobs.

*SJ_UNIVERSESTANCE
+Now allows the use of all Star Emperor's Sun, Moon, Star, and Universe skills.


*SJ_FALLINGSTAR
+Duration updated to official and is now affected by skill level used.

git-svn-id: svn://svn.code.sf.net/p/v1-3ceam/code/trunk@862 cad27aaa-dce3-4a30-a00a-e4fd67c11881

rewrite/conf/battle/client.conf

@@ -58,7 +58,7 @@ min_chat_delay: 0
 
 // Ranges of styles and dyes for humans.
 min_hair_style: 0
-max_hair_style: 29
+max_hair_style: 31
 min_hair_color: 0
 max_hair_color: 8
 min_cloth_color: 0
@@ -72,7 +72,7 @@ max_doram_hair_style: 6
 min_doram_hair_color: 0
 max_doram_hair_color: 8
 min_doram_cloth_color: 0
-max_doram_cloth_color: 0
+max_doram_cloth_color: 3
 
 // When set to yes, the damage field in packets sent from woe maps will be set
 // to -1, making it impossible for GMs, Bots and Hexed clients to know the
@@ -112,11 +112,8 @@ wedding_modifydisplay: no
 // Save Clothes color. (This will degrade performance) (Note 1)
 save_clothcolor: yes
 
-// Save body styles? (Don't turn this on unless you know what your doing.)
-// Best to keep this off until body styles are officially released.
-// If set to yes and you change to a style you don't have sprites for,
-// you won't beable to log back in since youll get client crashes at char select.
-save_body_style: no
+// Save body styles?
+save_body_style: yes
 
 // Do not display cloth colors for the wedding class?
 // Note: Both save_clothcolor and wedding_modifydisplay have to be enabled

rewrite/db/const.txt

@@ -463,14 +463,14 @@ BaseJob	119	1
 BaseClass	120	1
 killerrid	121 1
 killedrid	122 1
-BaseThird	2103	1
-MaxHairDye	2104	1
-MaxHairStyle	2105	1
-MaxBodyDye	2106	1
-MaxBodyStyle	2107	1
-MaxDoramHairDye	2108	1
-MaxDoramHairStyle	2109	1
-MaxDoramBodyDye	2110	1
+BaseThird	2104	1
+MaxHairDye	2105	1
+MaxHairStyle	2106	1
+MaxBodyDye	2107	1
+MaxBodyStyle	2108	1
+MaxDoramHairDye	2109	1
+MaxDoramHairStyle	2110	1
+MaxDoramBodyDye	2111	1
 
 bMaxHP	6
 bMaxSP	8
@@ -636,7 +636,9 @@ bMagicHPGainValue	2044
 bAddClassDropItem	2045
 
 bFixedCastRate	2101
-bAddMatk	2102
+bCooldownRate	2102
+bAddMatk	2103
+bNoMadoFuel	2112
 
 EQI_HEAD_TOP	1
 EQI_ARMOR	2

rewrite/db/item_db_3ceam.txt

@@ -540,6 +540,8 @@
 // Summoner Weapons And Equips
 1681,Short_Foxtail_Staff,Short Foxtail Staff,4,0,,0,30,,1,0,0x04000000,7,2,2,1,1,1,10,{},{},{}
 
+//28380,Fresh_Grass_Necklace,Fresh Grass Necklace,5,30000,,100,,0,,1,0x000FDF80,8,2,136,,0,0,0,{},{},{}
+
 // Summoner Item Required Items
 //515,Carrot,Carrot,0,15,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(18,20),0; },{},{}
 //567,Prawn,Shrimp,0,500,,40,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(117,192),0; },{},{}
@@ -550,6 +552,8 @@
 
 //18984
 
+6959,Costume_Change_Ticket,Costume Change Ticket,3,0,,10,,,,,,,,,,,,,{},{},{}
+
 // Updated Wedding Rings - Supports New 2016 Wedding Skills
 2634,Bridegroom_Ring,Wedding Ring,5,0,,0,,0,,0,0xFFFFFFFF,7,1,136,,0,0,0,{ skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; skill "WE_CALLALLFAMILY",1; skill "WE_ONEFOREVER",1; },{},{}
 2635,Bride_Ring,Wedding Ring,5,0,,0,,0,,0,0xFFFFFFFF,7,0,136,,0,0,0,{ skill "WE_MALE",1; skill "WE_FEMALE",1; skill "WE_CALLPARTNER",1; skill "WE_CALLALLFAMILY",1; skill "WE_ONEFOREVER",1; },{},{}

rewrite/db/mob_avail.txt

@@ -3,8 +3,9 @@
 // Use another mob's sprite for a monster.  0 for sprite will disable mob.
 // Mob must have an equipment it's pet counterpart can use or it will cause problems.  If no equip use 0.
 // The following if a player sprite is used
-// MobID,SpriteID,Sex,Hair,Hair_Color,Weapon,Shield,Head_Top,Head_Middle,Head_Bottom,Option,Dye_Color
+// MobID,SpriteID,Sex,Hair,Hair_Color,Weapon,Shield,Head_Top,Head_Middle,Head_Bottom,Option,Dye_Color,Body_Style
 // Use Item ID for weapons and shields, not View ID.
+// Only 3rd jobs (Not including Star Emperor/Soul Reaper) support the Body_Style setting. Use 0 for other jobs.
 
 //1002,1039	//Poring,Baphomet (Make Porings look like Baphomet)
 //1970,1002,10013	// new mob that looks like a Poring with a backpack
@@ -15,13 +16,13 @@
 
 // eAthena Dev Team
 // Valaris
-//1900,4013,1,1,1,1254,0,67,12,54,16,1
+//1900,4013,1,1,1,1254,0,67,12,54,16,1,0
 // Valaris Worshiper
-//1901,6,1,1,1,1219,2101,67,12,54,0,1
+//1901,6,1,1,1,1219,2101,67,12,54,0,1,0
 // MC Cameri
-//1902,14,1,6,6,1101,2105,0,0,0,32,3
+//1902,14,1,6,6,1101,2105,0,0,0,32,3,0
 // Poki#3
-//1903,4012,1,21,0,1720,0,102,184,57,16,0
+//1903,4012,1,21,0,1720,0,102,184,57,16,0,0
 // Sentry
 //1904,1286,0
 

rewrite/db/packet_db.txt

@@ -2083,7 +2083,7 @@ packet_ver: 36
 0x0acb,12
 0x0acc,18
 
-//2018-06-20eRagexeRE
+//2018-06-20eRagexeRE/2018-06-21aRagexeRE
 packet_ver: 37
 0x0437,7,actionrequest,2:6
 0x0438,10,useskilltoid,2:4:6

rewrite/db/skill_renewal_cast_db.txt

@@ -656,8 +656,8 @@
 2582,5000,1000,1000,20000,0,2000,0
 //-- SJ_UNIVERSESTANCE
 2583,0,0,0,0,0,0,0
-//-- SJ_FALLINGSTAR - Confirm the duration.
-2584,1000,2000,0,0,0,120000,0
+//-- SJ_FALLINGSTAR
+2584,1000,2000,0,0,0,120000:140000:160000:180000:200000:220000:240000,0
 //-- SJ_GRAVITYCONTROL
 2585,2000,0,500,20000,0,5000,0
 //-- SJ_BOOKOFDIMENSION

rewrite/doc/item_bonus.txt

@@ -444,5 +444,7 @@ bonus3 bAddClassDropItem,s,x,n;		Adds an n/100% chance of dropping item s when k
 
 bonus bFixedCastrate,-n;	Skill fixed cast time reduction in percentage. n is the percentage value and must be set as a negeative value.
 bonus2 bFixedCastrate,x,-n;	Skill fixed cast time reduction for a certain skill. x is the skill ID. n is the percentage value and must be set as a negeative value.
+bonus bCooldownRate,n;		Skill cooldown time adjustment in percentage. n is the percentage value.
 bonus bAddMatk,n;		Magical attack power + n
 bonus2 bUseSPrate,n,x;		Decrease SP consumption of skill n by x% (supports skill names)
+bonus bNoMadoFuel,n;		Skill requiring mado gear fuel will no longer require it. Set n to 0.

rewrite/src/map/battle.c

@@ -6265,7 +6265,7 @@ static const struct _battle_data {
 	{ "who_display_aid",                    &battle_config.who_display_aid,                 40,     0,      100,            },
 	{ "packet_ver_flag",                    &battle_config.packet_ver_flag,                 0xFFFFFF,0x0000,INT_MAX,        },
 	{ "min_hair_style",                     &battle_config.min_hair_style,                  0,      0,      INT_MAX,        },
-	{ "max_hair_style",                     &battle_config.max_hair_style,                  29,     0,      INT_MAX,        },
+	{ "max_hair_style",                     &battle_config.max_hair_style,                  31,     0,      INT_MAX,        },
 	{ "min_hair_color",                     &battle_config.min_hair_color,                  0,      0,      INT_MAX,        },
 	{ "max_hair_color",                     &battle_config.max_hair_color,                  8,      0,      INT_MAX,        },
 	{ "min_cloth_color",                    &battle_config.min_cloth_color,                 0,      0,      INT_MAX,        },
@@ -6436,13 +6436,13 @@ static const struct _battle_data {
 	{ "hesperuslit_bonus_stack",            &battle_config.hesperuslit_bonus_stack,         0,      0,      1,              },
 	{ "min_body_style",                     &battle_config.min_body_style,                  0,      0,      SHRT_MAX,       },
 	{ "max_body_style",                     &battle_config.max_body_style,                  4,      0,      SHRT_MAX,       },
-	{ "save_body_style",                    &battle_config.save_body_style,                 0,      0,      1,              },
+	{ "save_body_style",                    &battle_config.save_body_style,                 1,      0,      1,              },
 	{ "min_doram_hair_style",               &battle_config.min_doram_hair_style,            0,      0,      SHRT_MAX,       },
 	{ "max_doram_hair_style",               &battle_config.max_doram_hair_style,            6,      0,      SHRT_MAX,       },
 	{ "min_doram_hair_color",               &battle_config.min_doram_hair_color,            0,      0,      SHRT_MAX,       },
 	{ "max_doram_hair_color",               &battle_config.max_doram_hair_color,            8,      0,      SHRT_MAX,       },
 	{ "min_doram_cloth_color",              &battle_config.min_doram_cloth_color,           0,      0,      SHRT_MAX,       },
-	{ "max_doram_cloth_color",              &battle_config.max_doram_cloth_color,           0,      0,      SHRT_MAX,       },
+	{ "max_doram_cloth_color",              &battle_config.max_doram_cloth_color,           3,      0,      SHRT_MAX,       },
 	{ "hanbok_ignorepalette",               &battle_config.hanbok_ignorepalette,            0,      0,      1,              },
 	{ "oktoberfest_ignorepalette",          &battle_config.oktoberfest_ignorepalette,       0,      0,      1,              },
 	{ "summer2_ignorepalette",              &battle_config.summer2_ignorepalette,           0,      0,      1,              },

rewrite/src/map/itemdb.h

@@ -37,6 +37,8 @@ enum item_itemid {
 	ITEMID_PAINT_BRUSH,
 	ITEMID_SURFACE_PAINT,
 
+	ITEMID_MAGIC_GEAR_FUEL = 6146,
+
 	// Warlock's Magic Spellbooks
 	ITEMID_MAGICBOOK_FIREBOLT = 6189,
 	ITEMID_MAGICBOOK_COLDBOLT,
@@ -159,6 +161,7 @@ enum item_itemid {
 #define itemid_is_element_point(id) ( (id) >= ITEMID_SCARLETT_POINT && (id) <= ITEMID_LIME_GREEN_POINT )
 #define itemid_is_eclage_cures(id) ( (id) >= ITEMID_SNOW_FLIP && (id) <= ITEMID_YGGDRASIL_DUST )
 #define itemid_is_holy_bullet(id) ( (id) == ITEMID_SILVER_BULLET || (id) == ITEMID_PURIFICATION_BULLET )
+#define itemid_is_mado_fuel(id) ( (id) == ITEMID_MAGIC_GEAR_FUEL )
 
 //The only item group required by the code to be known. See const.txt for the full list.
 #define IG_FINDINGORE 6

rewrite/src/map/map.h

@@ -422,10 +422,10 @@ enum _sp {
 	SP_ADD_SKILL_BLOW, SP_SP_VANISH_RATE, SP_MAGIC_SP_GAIN_VALUE, SP_MAGIC_HP_GAIN_VALUE, SP_ADD_CLASS_DROP_ITEM, //2041-2045
 
 	//3CeAM
-	SP_FIXEDCASTRATE = 2101, //2101
-	SP_ADD_MATK, SP_BASETHIRD,
-	SP_MAX_HAIR_DYE,SP_MAX_HAIR_STYLE,SP_MAX_BODY_DYE,SP_MAX_BODY_STYLE,
-	SP_MAX_DORAM_HAIR_DYE,SP_MAX_DORAM_HAIR_STYLE,SP_MAX_DORAM_BODY_DYE
+	SP_FIXEDCASTRATE = 2101, SP_COOLDOWNRATE, SP_ADD_MATK, SP_BASETHIRD,
+	SP_MAX_HAIR_DYE, SP_MAX_HAIR_STYLE, SP_MAX_BODY_DYE, SP_MAX_BODY_STYLE,
+	SP_MAX_DORAM_HAIR_DYE, SP_MAX_DORAM_HAIR_STYLE, SP_MAX_DORAM_BODY_DYE,
+	SP_NO_MADOFUEL
 };
 
 enum _look {

rewrite/src/map/mob.c

@@ -3802,7 +3802,7 @@ static bool mob_readdb_mobavail(char* str[], int columns, int current)
 	mob_db_data[class_]->vd.class_=k;
 
 	//Player sprites
-	if(pcdb_checkid(k) && columns==12) {
+	if(pcdb_checkid(k) && columns==13) {
 		mob_db_data[class_]->vd.sex=atoi(str[2]);
 		mob_db_data[class_]->vd.hair_style=atoi(str[3]);
 		mob_db_data[class_]->vd.hair_color=atoi(str[4]);
@@ -3813,6 +3813,12 @@ static bool mob_readdb_mobavail(char* str[], int columns, int current)
 		mob_db_data[class_]->vd.head_bottom=atoi(str[9]);
 		mob_db_data[class_]->option=atoi(str[10])&~(OPTION_HIDE|OPTION_CLOAK|OPTION_INVISIBLE);
 		mob_db_data[class_]->vd.cloth_color=atoi(str[11]); // Monster player dye option - Valaris
+
+		// Only the main 3rd jobs have alternate outfits. Also make sure a setting over 1 isnt allowed.
+		if ( k >= JOB_RUNE_KNIGHT && k <= JOB_BABY_MECHANIC2 && atoi(str[12]) < 2 )
+			mob_db_data[class_]->vd.body_style=atoi(str[12]);
+		else// Selected job ID doesn't support a alternate outfit.
+			mob_db_data[class_]->vd.body_style=0;
 	}
 	else if(columns==3)
 		mob_db_data[class_]->vd.head_bottom=atoi(str[2]); // mob equipment [Valaris]
@@ -4336,7 +4342,7 @@ static void mob_load(void)
 #endif /* TXT_ONLY */
 	mob_readdb();
 
-	sv_readdb(db_path, "mob_avail.txt", ',', 2, 12, -1, &mob_readdb_mobavail);
+	sv_readdb(db_path, "mob_avail.txt", ',', 2, 13, -1, &mob_readdb_mobavail);
 	mob_read_randommonster();
 	mob_readchatdb();
 	mob_readskilldb();

rewrite/src/map/pc.c

@@ -2783,6 +2783,10 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
 		if(sd->state.lr_flag != 2)
 			sd->special_state.no_gemstone = 1;
 		break;
+	case SP_NO_MADOFUEL:
+		if(sd->state.lr_flag != 2)
+			sd->special_state.no_madofuel = 1;
+		break;
 	case SP_INTRAVISION: // Maya Purple Card effect allowing to see Hiding/Cloaking people [DracoRPG]
 		if(sd->state.lr_flag != 2) {
 			sd->special_state.intravision = 1;
@@ -2892,6 +2896,10 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
 		if(sd->state.lr_flag != 2)
 			sd->delayrate+=val;
 		break;
+	case SP_COOLDOWNRATE:
+		if(sd->state.lr_flag != 2)
+			sd->cooldownrate+=val;
+		break;
 	case SP_CRIT_ATK_RATE:
 		if(sd->state.lr_flag != 2)
 			sd->crit_atk_rate += val;

rewrite/src/map/pc.h

@@ -161,6 +161,7 @@ struct map_session_data {
 		unsigned no_castcancel2 : 1;
 		unsigned no_sizefix : 1;
 		unsigned no_gemstone : 1;
+		unsigned no_madofuel : 1;
 		unsigned intravision : 1; // Maya Purple Card effect [DracoRPG]
 		unsigned perfect_hiding : 1; // [Valaris]
 		unsigned no_knockback : 1;
@@ -325,7 +326,7 @@ struct map_session_data {
 
 	// zeroed vars end here.
 
-	int castrate,delayrate,hprate,sprate,dsprate;
+	int castrate,delayrate,cooldownrate,hprate,sprate,dsprate;
 	int hprecov_rate,sprecov_rate;
 	int matk_rate;
 	int critical_rate,hit_rate,flee_rate,flee2_rate,def_rate,def2_rate,mdef_rate,mdef2_rate;