Bladeren bron

- Some fixes with check weight.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13254 54d463be-8e91-2dee-dedb-b68131a5f0ec
zephyrus 16 jaren geleden
bovenliggende
commit
d9038a4109
3 gewijzigde bestanden met toevoegingen van 10 en 10 verwijderingen
  1. 4 4
      npc/quests/2007_relay.txt
  2. 6 5
      npc/quests/quests_nameless.txt
  3. 0 1
      npc/quests/quests_rachel.txt

+ 4 - 4
npc/quests/2007_relay.txt

@@ -17,7 +17,7 @@ payon,103,113,3	script	Ledrion#payon::RelayLedrion	109,{
 	getpartymember(getcharid(1));
 	set .@partymembercount,$@partymembercount;
 	set .@partyleader,getpartyleader(getcharid(1),2);
-	if (checkweight(907,300) < 0) {
+	if (checkweight(907,300) == 0) {
 		mes "^3355FFWait a minute! You're";
 		mes "carrying too many items";
 		mes "right now: store some of";
@@ -445,7 +445,7 @@ payon,83,327,3	script	Gatan#payon::RelayGatan	86,{
 	getpartymember(getcharid(1));
 	set .@partymembercount,$@partymembercount;
 	set .@partyleader,getpartyleader(getcharid(1),2);
-	if (checkweight(907,300) < 0) {
+	if (checkweight(907,300) == 0) {
 		mes "^3355FFWait a minute! You're";
 		mes "carrying too many items";
 		mes "right now: store some of";
@@ -1940,7 +1940,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 	getpartymember(getcharid(1));
 	set .@partymembercount,$@partymembercount;
 	set .@partyleader,getpartyleader(getcharid(1),2);
-	if (checkweight(907,300) < 0) {
+	if (checkweight(907,300) == 0) {
 		mes "^3355FFWait a minute! You're";
 		mes "carrying too many items";
 		mes "right now: store some of";
@@ -2733,7 +2733,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 	getpartymember(getcharid(1));
 	set .@partymembercount,$@partymembercount;
 	set .@partyleader,getpartyleader(getcharid(1),2);
-	if (checkweight(907,300) < 0) {
+	if (checkweight(907,300) == 0) {
 		mes "^3355FFWait a minute! You're";
 		mes "carrying too many items";
 		mes "right now: store some of";

+ 6 - 5
npc/quests/quests_nameless.txt

@@ -207,6 +207,7 @@ ra_in01,308,59,1	script	Waiter#Aru	930,{
 			close;
 		}
 		if (aru_monas == 6) {
+			next;
 			mes "[Waiter]";
 			mes "What would you like";
 			mes "to order? Or... If I'm";
@@ -276,7 +277,7 @@ ra_in01,301,43,0	script	#Aru_conv	-1,3,3,{
 	end;
 
 OnTouch:
-	if (checkweight(907,200) < 0) {
+	if (checkweight(907,200) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -682,7 +683,7 @@ ve_in,81,296,3	script	Soldier#Aru	946,{
 }
 
 ra_temple,165,57,5	script	Niren#ss	915,{
-	if (checkweight(907,200) < 0) {
+	if (checkweight(907,200) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -1938,7 +1939,7 @@ nameless_n,259,218,3	script	Larjes#Boat1	97,{
 }
 
 abbey02,224,70,0	script	Book#Aru	111,{
-	if (checkweight(7766,1) < 0) {
+	if (checkweight(7766,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -2035,7 +2036,7 @@ OnTimer300000:
 }
 
 abbey03,232,232,4	script	Dead Man#Aru	956,{
-	if (checkweight(7766,1) < 0) {
+	if (checkweight(7766,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -2530,7 +2531,7 @@ ra_temin,103,151,7	script	Female Follower#em	917,{
 }
 
 ra_fild03,139,355,5	script	Ishmael#em	914,{
-	if (checkweight(907,200) < 0) {
+	if (checkweight(907,200) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";

+ 0 - 1
npc/quests/quests_rachel.txt

@@ -5627,7 +5627,6 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "^3131FF"+.@input$+"^000000?";
 				next;
 				if (.@input$ == "Varmunt") {
-					mes "[High Priest Zhed]";
 					mes "[High Priest Zhed]";
 					mes "Oh, you've heard of him?";
 					mes "Yes, his name was Varmunt.";