Forráskód Böngészése

Removed hardcoded aloevera restriction

Additional changed some hardcoded ids to constants.
Lemongrass3110 9 éve
szülő
commit
b1b43bb0df
2 módosított fájl, 2 hozzáadás és 5 törlés
  1. 1 0
      db/item_nouse.txt
  2. 1 5
      src/map/pc.c

+ 1 - 0
db/item_nouse.txt

@@ -11,6 +11,7 @@
 // Group ID Override:
 // Group ID Override:
 //	Group ID necessary to override this setting.
 //	Group ID necessary to override this setting.
 
 
+606,1,100	// Aloebera
 619,1,100	// Unripe_Apple
 619,1,100	// Unripe_Apple
 620,1,100	// Orange_Juice
 620,1,100	// Orange_Juice
 621,1,100	// Bitter_Herb
 621,1,100	// Bitter_Herb

+ 1 - 5
src/map/pc.c

@@ -4706,10 +4706,6 @@ bool pc_isUseitem(struct map_session_data *sd,int n)
 		case ITEMID_ANODYNE:
 		case ITEMID_ANODYNE:
 			if( map_flag_gvg(sd->bl.m) )
 			if( map_flag_gvg(sd->bl.m) )
 				return false;
 				return false;
-		case ITEMID_ALOEBERA:
-			if( pc_issit(sd) )
-				return false;
-			break;
 		case ITEMID_WING_OF_FLY:
 		case ITEMID_WING_OF_FLY:
 		case ITEMID_GIANT_FLY_WING:
 		case ITEMID_GIANT_FLY_WING:
 			if( map[sd->bl.m].flag.noteleport || map_flag_gvg(sd->bl.m) ) {
 			if( map[sd->bl.m].flag.noteleport || map_flag_gvg(sd->bl.m) ) {
@@ -4729,7 +4725,7 @@ bool pc_isUseitem(struct map_session_data *sd,int n)
 				clif_displaymessage(sd->fd, msg_txt(sd,663));
 				clif_displaymessage(sd->fd, msg_txt(sd,663));
 				return false;
 				return false;
 			}
 			}
-			if( nameid != 601 && nameid != 12212 && map[sd->bl.m].flag.noreturn )
+			if( nameid != ITEMID_WING_OF_FLY && nameid != ITEMID_GIANT_FLY_WING && map[sd->bl.m].flag.noreturn )
 				return false;
 				return false;
 			break;
 			break;
 		case ITEMID_BUBBLE_GUM:
 		case ITEMID_BUBBLE_GUM: