浏览代码

- Added missing bonuses for 'Maiden Hat'. (bugreport:2826)
- Fixed an issue with Battleground Exchange NPC. (bugreport:2839)
- Fixed an issue with Platinum Skills NPC. (bugreport:2847)
- Fixed some typos and engrish in iRO Experience quests.

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

Kisuka 16 年之前
父节点
当前提交
c9c3700399
共有 5 个文件被更改,包括 23 次插入20 次删除
  1. 1 1
      db/item_db.txt
  2. 1 1
      doc/script_commands.txt
  3. 1 1
      npc/battleground/bg_common.txt
  4. 6 2
      npc/custom/platinum_skills.txt
  5. 14 15
      npc/quests/iRO_Exp.txt

+ 1 - 1
db/item_db.txt

@@ -2219,7 +2219,7 @@
 5208,Rideword_Hat,Rideword Hat,5,20,,300,,2,,1,0xFFFFFFFE,7,2,256,,40,1,262,{ bonus2 bHPDrainRate,50,8; bonus2 bSPDrainRate,10,4; bonus2 bHPLossRate,10,5000; },{},{}
 5209,Yellow_Baseball_Cap,iRO Baseball Cap,5,20,,300,,2,,0,0xFFFFFFFE,7,2,256,,0,1,263,{},{},{}
 5210,Flying_Angel,Flying Angel,5,20,,300,,1,,0,0xFFFFFFFF,7,2,256,,10,1,264,{ bonus bCastrate,-3; bonus bAspdRate,3; },{},{}
-5211,Dress_Hat,Ribbon Hat,5,0,,200,,2,,1,0xFFFFFFFF,7,2,256,,20,1,265,{ bonus bMdef,7; },{},{}
+5211,Dress_Hat,Ribbon Hat,5,0,,200,,2,,1,0xFFFFFFFF,7,2,256,,20,1,265,{ bonus bMdef,7; bonus bStr,1; bonus bInt,1; if(getrefine() >= 7) {bonus bAtkRate,3; bonus bMAtkRate,3; bonus bSkillHeal,"AL_HEAL",6;} else { bonus bAtkRate,2; bonus bMAtkRate,2; bonus bSkillHeal,"AL_HEAL",5;} },{},{}
 5212,Satellite_Hairband,Solar Panels,5,0,,1000,,3,,1,0xFFFFFFFF,7,2,256,,30,1,266,{ bonus bMaxHP,50; bonus bMaxSP,10; skill "AL_RUWACH",1; },{},{ sc_end SC_RUWACH; }
 5213,Black_Bunny_Band,Rabbit Ears,5,0,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,1,267,{ bonus bAgi,2; bonus bMdef,3; },{},{}
 5214,Moonlight_Flower_Hat,Cat Helm,5,0,,200,,3,,0,0xFFFFFFFF,7,2,768,,0,1,268,{ bonus bDex,2; bonus3 bAutoSpell,"AL_INCAGI",1,50; },{},{}

+ 1 - 1
doc/script_commands.txt

@@ -2811,7 +2811,7 @@ has a skill or not, and it can tell you if the level is high enough.
 
 Example 1:
 
-        f (getskilllv(152)) goto L_HasSkillThrowStone;
+        if (getskilllv(152)) goto L_HasSkillThrowStone;
         mes "You don't have Throw Stone";
         close;
     L_HasSkillThrowStone:

+ 1 - 1
npc/battleground/bg_common.txt

@@ -1225,7 +1225,7 @@ bat_room,160,150,3	script	Erundek	109,{
 	set .@Menu$, "";
 	set .@Count, getarraysize(.@Item_DB);
 	for( set .@i, 0; .@i < .@Count; set .@i, .@i + 1 )
-		set .@Menu$, .@Menu$ + getitemname(@Item_DB[.@i]) + ":";
+		set .@Menu$, .@Menu$ + getitemname(.@Item_DB[.@i]) + ":";
 
 	set .@Item_ID, .@Item_DB[select(.@Menu$) - 1];
 

+ 6 - 2
npc/custom/platinum_skills.txt

@@ -3,7 +3,7 @@
 //===== By: =================================================================================
 //= Keichii and edited by DarkChild
 //===== Current Version: ====================================================================
-//= 2.2
+//= 2.5
 //===== Compatible With: ====================================================================
 //= Any eAthena Version
 //===== Description: ========================================================================
@@ -14,6 +14,7 @@
 //=2.2 Simplified Job Checks [Silentdragon]
 //=2.3 Thehell? Cleaned up script removed the nastiness. Also added rebirth skills. [Spre]
 //=2.4 Added Advanced skills. [Spre]
+//=2.5 Added dialog for if the user is none of the listed jobs. [Kisuka]
 //===========================================================================================
 prontera,128,200,6	script	Platinum Skill NPC	94,{
 	mes "[Platinum Skill NPC]";
@@ -23,7 +24,7 @@ prontera,128,200,6	script	Platinum Skill NPC	94,{
 	mes "[Platinum Skill NPC]";
 	mes "Have a nice day... >.>";
 	close;
-}
+	}
 	if (BaseClass==Job_Novice) {
 		skill 142,1,0;
 		skill 143,1,0;
@@ -98,4 +99,7 @@ prontera,128,200,6	script	Platinum Skill NPC	94,{
 		skill 1005,1,0;
 		close;
 	}
+	mes "[Platinum Skill NPC]";
+	mes "Im sorry, but there is no special skills that I can give you.";
+	close;
 }

+ 14 - 15
npc/quests/iRO_Exp.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Kisuka
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -18,6 +18,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First version. [Kisuka]
 //= 1.1 Moved Jeremy and Gregor to different maps. [L0ne_W0lf]
+//= 1.2 Fixed the engrish and typos.
 //============================================================
 
 // Yullo - 25 Porcupine Quill
@@ -100,8 +101,8 @@ moc_fild17,208,346,5	script	Shone#iROExp	707,{
 	mes "skills.";
 	next;
 	mes "[Shone]";
-	mes "Hey do you think you van help me? I";
-	mes "am trying to collect ^00CE0025 Earthwarm^000000";
+	mes "Hey do you think you can help me? I";
+	mes "am trying to collect ^00CE0025 Earthworm^000000";
 	mes "^00CE00Peelings^000000. I will reward you if you";
 	mes "help.";
 	next;
@@ -112,7 +113,7 @@ moc_fild17,208,346,5	script	Shone#iROExp	707,{
 	}
 	if (countitem(1055) < 25) {
 		mes "[Shone]";
-		mes "I don't see any ^00CE00Earthworm Peerlings^000000.";
+		mes "I don't see any ^00CE00Earthworm Peelings^000000.";
 		mes "Are you trying to scam me?";
 		close;
 	}else{
@@ -123,9 +124,9 @@ moc_fild17,208,346,5	script	Shone#iROExp	707,{
 		mes "Thank you for the 25 Earthworm";
 		mes "Peelings!";
 		mes "Here is that reward I promised you,";
-		mes "I hope take this wisdom I have";
-		mes "passed on to you and share it with";
-		mes "others.";
+		mes "I hope you will take this wisdom I";
+		mes "have passed on to you and share it";
+		mes "with others.";
 		close;
 	}
 }
@@ -191,16 +192,16 @@ gef_fild04,191,54,4	script	Halgus#iROExp	123,{
 	}
 	else if((BaseLevel > 20)) {
 		mes "[Halgus]";
-		mes "You are way to learned to be";
+		mes "You are way to strong to be";
 		mes "hunting these little things.";
 		next;
 		close;
 	}
 	mes "[Halgus]";
-	mes "New here are you? Well look I like";
+	mes "New here are you? Well look, I like";
 	mes "helping new faces around here.";
 	mes "And lets be honest you are not the";
-	mes "prettiest look face I have seen.";
+	mes "prettiest looking face I have seen.";
 	next;
 	mes "[Halgus]";
 	mes "None-the-less my daughter would";
@@ -314,9 +315,8 @@ mjolnir_01,293,20,3	script	Nutters#iROExp	779,{
 	mes "Acorns.";
 	next;
 	mes "[Nutters]";
-	mes "Can you help me find ^00CE0025 Acorns^000000.I";
-	mes "will reward you with much if you";
-	mes "can.";
+	mes "Can you help me find ^00CE0025 Acorns^000000.";
+	mes "I will reward you with much if you can.";
 	next;
 	if (select("I have 25 Acorns:Please come again?") == 2) {
 		mes "[Nutters]";
@@ -326,8 +326,7 @@ mjolnir_01,293,20,3	script	Nutters#iROExp	779,{
 	if (countitem(1026) < 25) {
 		mes "[Nutters]";
 		mes "Where are my ^00CE00Acorns^000000? Hey, I'm not";
-		mes "playing, you better not hold out on";
-		mes "me.";
+		mes "playing, you better not hold out on me.";
 		close;
 	}else{
 		mes "[Nutters]";