Jelajahi Sumber

* Follow up 9cca188, change enum of IT_WEAPON and IT_ARMOR on src files

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
Cydh Ramdh 11 tahun lalu
induk
melakukan
74740b4491
3 mengubah file dengan 9 tambahan dan 9 penghapusan
  1. 2 2
      conf/msg_conf/map_msg.conf
  2. 2 2
      src/common/mmo.h
  3. 5 5
      src/map/atcommand.c

+ 2 - 2
conf/msg_conf/map_msg.conf

@@ -1517,7 +1517,7 @@
 1484: You're currently not autolooting this item type.
 1485: Removed item type: '%s' {%d} from your autoloottype list.
 1486: To add an item type to the list, use "@aloottype +<type name or ID>". To remove an item type, use "@aloottype -<type name or ID>".
-1487: Type List: healing = 0, usable = 2, etc = 3, weapon = 4, armor = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10
+1487: Type List: healing = 0, usable = 2, etc = 3, armor = 4, weapon = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10
 1488: "@aloottype reset" will clear your autoloottype list.
 1489: Your autoloottype list is empty.
 1490: Item types on your autoloottype list:
@@ -1525,7 +1525,7 @@
 
 // @dropall
 1492: Usage: @dropall {<type>}
-1493: Type List: (default) all = -1, healing = 0, usable = 2, etc = 3, weapon = 4, armor = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10
+1493: Type List: (default) all = -1, healing = 0, usable = 2, etc = 3, armor = 4, weapon = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10
 1494: %d items are dropped!
 
 //Banking

+ 2 - 2
src/common/mmo.h

@@ -173,8 +173,8 @@ enum item_types {
 	IT_UNKNOWN, //1
 	IT_USABLE,  //2
 	IT_ETC,     //3
-	IT_WEAPON,  //4
-	IT_ARMOR,   //5
+	IT_ARMOR,   //4
+	IT_WEAPON,  //5
 	IT_CARD,    //6
 	IT_PETEGG,  //7
 	IT_PETARMOR,//8

+ 5 - 5
src/map/atcommand.c

@@ -5877,7 +5877,7 @@ ACMD_FUNC(autolootitem)
  * @autoloottype
  * Flags:
  * 1:   IT_HEALING,  2:   IT_UNKNOWN,  4:    IT_USABLE, 8:    IT_ETC,
- * 16:  IT_WEAPON,   32:  IT_ARMOR,    64:   IT_CARD,   128:  IT_PETEGG,
+ * 16:  IT_ARMOR,    32:  IT_WEAPON,   64:   IT_CARD,   128:  IT_PETEGG,
  * 256: IT_PETARMOR, 512: IT_UNKNOWN2, 1024: IT_AMMO,   2048: IT_DELAYCONSUME
  * 262144: IT_CASH
  *------------------------------------------
@@ -5913,10 +5913,10 @@ ACMD_FUNC(autoloottype)
 			type = IT_USABLE;
 		else if ((strncmp(message, "etc", 3) == 0) || (atoi(message) == 3))
 			type = IT_ETC;
-		else if ((strncmp(message, "weapon", 3) == 0) || (atoi(message) == 4))
-			type = IT_WEAPON;
-		else if ((strncmp(message, "armor", 3) == 0) || (atoi(message) == 5))
+		else if ((strncmp(message, "armor", 3) == 0) || (atoi(message) == 4))
 			type = IT_ARMOR;
+		else if ((strncmp(message, "weapon", 3) == 0) || (atoi(message) == 5))
+			type = IT_WEAPON;
 		else if ((strncmp(message, "card", 3) == 0) || (atoi(message) == 6))
 			type = IT_CARD;
 		else if ((strncmp(message, "petegg", 4) == 0) || (atoi(message) == 7))
@@ -5959,7 +5959,7 @@ ACMD_FUNC(autoloottype)
 			break;
 		case 3:
 			clif_displaymessage(fd, msg_txt(sd,1486)); // To add an item type to the list, use "@aloottype +<type name or ID>". To remove an item type, use "@aloottype -<type name or ID>".
-			clif_displaymessage(fd, msg_txt(sd,1487)); // Type List: healing = 0, usable = 2, etc = 3, weapon = 4, armor = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10
+			clif_displaymessage(fd, msg_txt(sd,1487)); // Type List: healing = 0, usable = 2, etc = 3, armor = 4, weapon = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10
 			clif_displaymessage(fd, msg_txt(sd,1488)); // "@aloottype reset" will clear your autoloottype list.
 			if (sd->state.autoloottype == ITEM_NONE)
 				clif_displaymessage(fd, msg_txt(sd,1489)); // Your autoloottype list is empty.