Added Clothing Effect Removal Service (#3793)

Fixes #3789

Thanks to @Everade and @Balferian

npc/re/merchants/clothing_buff_removal.txt

@@ -0,0 +1,33 @@
+//===== rAthena Script =======================================
+//= Clothing Effect Removal Service
+//===== Description: =========================================
+//= Service to remove clothing effects like Xmas, Wedding, ...
+//===== Changelog: ===========================================
+//= 1.0 Initial version. [Balferian, Everade, Lemongrass]
+//============================================================
+
+prontera,80,106,5	script	Clothing Effect Removal Service	4_EP16_COOK2,{
+	mes "[Derek Shot]";
+	mes "Are you unable to participate in battle because of clothing buffs? It has to be annoying.";
+	next;
+	mes "[Derek Shot]";
+	mes "While it looks good on you, it can also get really annoying. I can get rid of it with a single hand gesture!! I will arrange it neatly. If you are ready, choose your option!";
+	next;
+	switch( select( "Keep it", "Release it immediately" ) ){
+		case 1:
+			mes "[Derek Shot]";
+			mes "Come back to me, if you change your mind.";
+			close;
+		case 2:
+			sleep2 500;
+			specialeffect2 EF_SPHERE;
+			sleep2 500;
+			specialeffect2 EF_SPHERE;
+			sleep2 500;
+			specialeffect2 EF_SPHERE;
+			mes "[Derek Shot]";
+			mes "Removal has been completed. Make sure you can move freely now.";
+			atcommand "@changedress";
+			close;
+	}
+}

npc/re/scripts_athena.conf

@@ -93,6 +93,7 @@ npc: npc/re/merchants/bio4_reward.txt
 //npc: npc/re/merchants/card_exchange.txt
 npc: npc/re/merchants/card_separation.txt
 npc: npc/re/merchants/catalog.txt
+npc: npc/re/merchants/clothing_buff_removal.txt
 npc: npc/re/merchants/coin_exchange.txt
 npc: npc/re/merchants/diamond.txt
 npc: npc/re/merchants/enchan_ko.txt

src/map/atcommand.cpp

@@ -9727,11 +9727,11 @@ ACMD_FUNC(changedress){
 		if( sd->sc.data[type] ) {
 			status_change_end( &sd->bl, type, INVALID_TIMER );
 			// You should only be able to have one - so we cancel here
-			return 0;
+			break;
 		}
 	}
 
-	return -1;
+	return 0;
 }
 
 ACMD_FUNC(costume) {