Bläddra i källkod

Minor bug fixes

[npc/cities/geffen.txt]
- fixed bug with Psychic Advisor (bugreport:7928)

[npc/quests/seals/megingard_seal.txt]
- fixed small bug with Librarian where he would spam the NPC dialogue
  because of a misplaced "next"

[npc/re/merchants/enchan_mora.txt]
- fixed bug with wrong enchants (bugreport:7930)
Deadly Silence 11 år sedan
förälder
incheckning
7beb7edc77
3 ändrade filer med 28 tillägg och 23 borttagningar
  1. 20 17
      npc/cities/geffen.txt
  2. 3 2
      npc/quests/seals/megingard_seal.txt
  3. 5 4
      npc/re/merchants/enchan_mora.txt

+ 20 - 17
npc/cities/geffen.txt

@@ -1,28 +1,29 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script ======================================================
 //= Geffen Town
-//===== By: ================================================== 
+//===== By: =================================================================
 //= Everybody mentioned in the comments
-//===== Current Version: ===================================== 
-//= 1.9
-//===== Compatible With: ===================================== 
+//===== Current Version: ====================================================
+//= 1.10
+//===== Compatible With: ====================================================
 //= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: ========================================================
 //= [Official Conversion]
 //= Geffen Town NPCs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: ================================================
 //= Fully working
-//= 1.1 - Spell Checked [massdriller]
-//= 1.2 Fixed more typos [Nexon]
-//= 1.3 added a Level 4 weapon quest related NPC [MasterOfMuppets]
-//= 1.4 Removed Duplicates [Silent]
-//= 1.5 Fixed some typos and coordinates [Musashiden]
+//= 1.1  - Spell Checked [massdriller]
+//= 1.2  Fixed more typos [Nexon]
+//= 1.3  added a Level 4 weapon quest related NPC [MasterOfMuppets]
+//= 1.4  Removed Duplicates [Silent]
+//= 1.5  Fixed some typos and coordinates [Musashiden]
 //= 1.5a Fixed a small typo [Evera]
-//= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.6  Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.6a Small bug fix. (end -> next) care of Lesbian. [L0ne_W0lf]
-//= 1.7 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
-//= 1.8 Fixed character's name and swapped gender dialogues [Lupus]
-//= 1.9 Replaced effect numerics with constants. [Samuray22]
-//============================================================
+//= 1.7  Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
+//= 1.8  Fixed character's name and swapped gender dialogues [Lupus]
+//= 1.9  Replaced effect numerics with constants. [Samuray22]
+//= 1.10 Bug fixes (bugreport:7928) [DeadlySilence]
+//===========================================================================
 
 geffen,59,143,0	script	Meera	91,{
 	mes "[Meera]";
@@ -1204,6 +1205,7 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 		mes "Well, in any case, concentrating on your studies is tough, but it can be rewarding. I hope you do well in whatever you choose to do~";
 		close;
 	case 5:
+		mes "[Psychic Advisor]";
 		mes "The future? I thought it was implied that any fortune I tell you is about the future in the specific field that you choose.";
 		next;
 		mes "[Psychic Advisor]";
@@ -1265,6 +1267,7 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 		mes "That's my prediction. Can you really argue with the wisdom of the spirit world?";
 		close;
 	case 6:
+		mes "[Psychic Advisor]";
 		mes "Fashion...?";
 		mes "What does that have to do with matters of the supernatural? Well, um, let me contact the spirits. Ah! Here we go...";
 		next;

+ 3 - 2
npc/quests/seals/megingard_seal.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 2.0
+//= 2.1
 //===== Compatible With: ===================================== 
 //= rAthena
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= 1.8 Corrected how exp reward is applied. [L0ne_W0lf]
 //= 1.9 Fixed some input checks and variable types. [brianluau]
 //= 2.0 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.1 Fixed minor bug with the Librarian Jekan
 //============================================================
 
 prt_castle,44,151,0	script	Rebarev Doug	56,{
@@ -803,8 +804,8 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 			mes "[Librarian Jekan]";
 			mes "Darn it...!";
 			mes "I can't read anything when the light is this dim! It's bad enough my eyes have gone bad...";
-			next;
 			while(1) {
+				next;
 				switch(select("You have bad eyes?:I want to read some documents.:Let me help you find those files...:What kind of files are you looking for?")) {
 				case 1:
 					mes "[Librarian Jekan]";

+ 5 - 4
npc/re/merchants/enchan_mora.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Euphy
 //===== Current Version: ===================================== 
-//= 1.1a
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,9 +11,10 @@
 //= Adds enchantments to various items in exchange for
 //= Mora coins.
 //===== Additional Comments: ================================= 
-//= 1.0 First Version. [Euphy]
-//= 1.1 Optimized. [Euphy]
+//= 1.0  First Version. [Euphy]
+//= 1.1  Optimized. [Euphy]
 //= 1.1a Bug fixes. [Lemongrass]
+//= 1.2  Bug fixes (bugreport:7930) [DeadlySilence]
 //============================================================ 
 
 // Arch Bishop Enchants :: coin_arc
@@ -222,7 +223,7 @@ mora,96,74,5	script	Master of Relics#pa0829	495,{
 			if (.@i <= 1024) {
 				// Basic combinations
 				// (raw: .@i increments by 16, 4 repeats)
-				setarray .@enchant_slot2[0],4710,4720,4721,4240; //Inteligence2,Dexterity1,Dexterity2,Vitality1
+				setarray .@enchant_slot2[0],4711,4720,4721,4740; //Inteligence2,Dexterity1,Dexterity2,Vitality1
 				setarray .@enchant_slot3[0],.@sp,4799,4766,4788; //[sp],HP500,Atk2,Mdef6
 				setarray .@enchants[2],
 					.@enchant_slot2[rand(getarraysize(.@enchant_slot2))],