summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/monster_race.txt5
-rw-r--r--npc/other/msg_boards.txt12
2 files changed, 9 insertions, 8 deletions
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index 88493c523..0b430853a 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN (Trunk, r12752+)
//===== Description: =========================================
@@ -16,6 +16,7 @@
//= 1.0 First version. Please report bugs. [L0ne_W0lf]
//= 1.1 Corrected a minor typo. [L0ne_W0lf]
//= 1.2 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 1.3 Ei'felle now gives Exercise. (Bugreport:4092) [L0ne_W0lf]
//============================================================
//============================================================
@@ -11156,7 +11157,7 @@ ein_in01,85,208,5 script Ei felle#repay01 854,{
callsub S_BonusReward,1500,1235;
end;
case 11:
- callsub S_BonusReward,1500,1223;
+ callsub S_BonusReward,1500,1233;
end;
case 12:
callsub S_BonusReward,1500,1232;
diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt
index afa6ec819..10f6ac8a2 100644
--- a/npc/other/msg_boards.txt
+++ b/npc/other/msg_boards.txt
@@ -4,7 +4,7 @@
//= kobra_k88
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= [Aegis Conversion]
//= eAthena 7.15 +
@@ -23,6 +23,7 @@
//= 1.4 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
//= 1.5 Removed a duplicate related to the Sign Quest. [SinSloth]
//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.6 COmmented out conflicting npcs. (bugreport:4093) [L0ne_W0lf]
//============================================================
// Prontera
@@ -59,13 +60,13 @@ prontera,278,212,1 script Sign#Prt3 111,{
mes "Please help keep Prontera a clean place.";
close;
}
-
+/*
prontera,150,326,1 script Sign#Prt4 111,{
mes "^993300- The Sign Reads -^000000";
mes "Citizens of Prontera are Welcomed in the Prontera Castle.";
close;
}
-
+*/
prontera,31,212,1 script Billboard#Prt5 111,{
mes "^993300- The Billboard Reads -^000000";
mes "~WANTED~";
@@ -152,14 +153,13 @@ geffen,116,58,1 script Geffen Bulletin#Gef1 111,{
mes "Remember Wizard's...It's not how many skills you know, it's the magic that counts!";
close;
}
-
+/*
geffen,61,174,1 script Sign#Gef2 111,{
-OnClick:
mes "^993300- The Sign Reads -^000000";
mes "- Seems to be written in a language unfamiliar to you -";
close;
}
-
+*/
geffen,113,104,1 script Billboard#Gef3 111,{
mes "^993300- The Billboard Reads -^000000";
mes "Selling: Brand new Chon Chon Doll!";