- Added some new items and headgears.

- Changed the way DEF Potion and MDEF potion works to official.
- Cleanups to Barricade Engine. It now can be used in WoE 2.0, i will release optional scripts soon.
- Fixes to @noks. Now if the mob is targeting someone else the protection get lost.
- Added new status effects icons to cash items.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12693 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 7 insertions, 7 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 1f69df496..239f1aa32 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -7801,28 +7801,28 @@ int atcommand_showdelay(const int fd, struct map_session_data* sd, const char* c
  *------------------------------------------*/
 int atcommand_barricade(const int fd, struct map_session_data* sd, const char* command, const char* message)
 {
-	int x = 0, y = 0, size = 1, killable = 0, dir = 0;
+	int x = 0, y = 0, size = 1, killable = 0, shootable = 0, dir = 0;
 	char event[50];
 	short result;
 
-	if( !message || !*message || (sscanf(message, "%d %d %d %d %d %50s", &x, &y, &size, &dir, &killable, event) < 6) )
+	if( !message || !*message || (sscanf(message, "%d %d %d %d %d %d %50s", &x, &y, &size, &dir, &killable, &shootable, event) < 7) )
 	{
-		clif_displaymessage(fd, "usage @barricade <x> <y> <size> <dir> <killable> <event>");
+		clif_displaymessage(fd, "usage @barricade <x> <y> <size> <dir> <killable> <shootable> <event>");
 		return -1;
 	}
 
 	if( x == -1 ) x = sd->bl.x;
 	if( y == -1 ) y = sd->bl.y;
 
-	result = mob_barricade_build(sd->bl.m, x, y, size, dir, (bool)killable, event);
+	result = mob_barricade_build(sd->bl.m, x, y, "--ja--", size, dir, (bool)killable, false, (bool)shootable, false, event);
 
 	switch( result )
 	{
 	case 0: clif_displaymessage(fd, "Barricade build."); return 0; break;
 	case 1: clif_displaymessage(fd, "Barricade fail. Invalid Size"); break;
-	case 2: clif_displaymessage(fd, "Barricade fail. Wall problem."); break;
-	case 3: clif_displaymessage(fd, "Barricade fail. Invalid Event"); break;
-	case 4: clif_displaymessage(fd, "Barricade fail. Event already exists"); break;
+	case 2: clif_displaymessage(fd, "Barricade fail. Invalid Event"); break;
+	case 3: clif_displaymessage(fd, "Barricade fail. Event already exists"); break;
+	case 4: clif_displaymessage(fd, "Barricade fail. Wall problem."); break;
 	}
 
 	return -1;