Ver Fonte

> Quick fixes:
* Incorrect quest check in Malangdo quests, "Yggdrasil Berry Gathering". (bugreport:7711)
* Typo breaking ammunition in hotkeys. (follow-up r17349, bugreport:7709)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17350 54d463be-8e91-2dee-dedb-b68131a5f0ec

euphyy há 12 anos atrás
pai
commit
e8dcdf9ecb
2 ficheiros alterados com 5 adições e 5 exclusões
  1. 4 4
      npc/re/quests/quests_malangdo.txt
  2. 1 1
      src/map/clif.c

+ 4 - 4
npc/re/quests/quests_malangdo.txt

@@ -1804,7 +1804,7 @@ mal_in01,114,169,5	script	Rican#mal	547,{
 		mes "If you see my son, please tell him to get back soon~";
 		close;
 	} else if (ma_tomas > 99) {
-		if (checkquest(11238,PLAYTIME) == 0 || checkquest(11238,PLAYTIME) == 1) {
+		if (checkquest(11238) != -1) {
 			if (countitem(6435) < 30) {
 				mes "[Rican]";
 				mes "You need exactly 30 to get a set!";
@@ -3854,11 +3854,11 @@ mal_in02,76,63,7	script	Cleanyang	544,{
 			mes "Recently, there are 9 spot that hided cat's ship biscuit as well.";
 			next;
 			mes "[Cleanyang]";
-			mes "Someone think that good angel took them all as I collected and threw away";
+			mes "Someone think that good angel took them all as I collected and threw away.";
 			mes "He still hide them that place.";
 			next;
 			mes "[Cleanyang]";
-			mes "It is so easy because I don't have to search everywhere, but";
+			mes "It is so easy because I don't have to search everywhere, but...";
 			mes "Please search the 9 spot where hiding frequently.";
 			close;
 		}
@@ -3873,7 +3873,7 @@ mal_in02,76,63,7	script	Cleanyang	544,{
 		case 1:
 			mes "[Cleanyang]";
 			mes "My service to you today.";
-			mes "The inside of ship Navi, home and cat tower too. Don't even miss a blade of grass";
+			mes "The inside of ship Navi, home and cat tower too. Don't even miss a blade of grass.";
 			mes "Search everywhere.";
 			setquest 7268;
 			close;

+ 1 - 1
src/map/clif.c

@@ -2307,7 +2307,7 @@ void clif_item_sub(unsigned char *buf, int n, int idx, struct item *i, struct it
 #endif
 	} else { //Stackable item. 22.B
 		WBUFW(buf,n+6)=i->amount;
-		WBUFW(buf,n+8)=(equip == -2 && id->equip == EQP_AMMO)?i->equip:0;
+		WBUFW(buf,n+8)=(equip == -2 && id->equip == EQP_AMMO)?id->equip:0;
 		clif_addcards(WBUFP(buf, n+10), i); //8B
 #if PACKETVER >= 20071002
 		WBUFL(buf,n+18)=i->expire_time;