summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-15 17:13:04 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-15 17:13:04 +0000
commitc25d6f5e6c3f092f70bf28cb0a3ac71e2ab89ead (patch)
treeb55395038c48dc99235e7385fbd43df5645e464a /npc
parent86b35597e549392cf2db3974fc140a50e021b5a0 (diff)
downloadhercules-c25d6f5e6c3f092f70bf28cb0a3ac71e2ab89ead.tar.gz
hercules-c25d6f5e6c3f092f70bf28cb0a3ac71e2ab89ead.tar.bz2
hercules-c25d6f5e6c3f092f70bf28cb0a3ac71e2ab89ead.tar.xz
hercules-c25d6f5e6c3f092f70bf28cb0a3ac71e2ab89ead.zip
* Some serious code cleanups
- adjusted @reloadbattleconf to not depend on variable ordering - changed all battle vars to 'int' (removes pointless duplicit coding) - added min, max and default columns to battle config data structure - added properly bounded values for these columns (or at least tried to) - battle-conf loading will now complain if it finds unknown settings, and will reject values that are outside of the allowed range - added CHATROOM_TITLE_SIZE and CHATROOM_PASS_SIZE - partially cleaned up chatroom manipulation code * Fixed 'Job_Professer' typo in mage jobchange quest git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11017 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/jobs/1-1/mage.txt2
-rw-r--r--npc/jobs/novice/novice.txt2
-rw-r--r--npc/quests/skills/monk_skills.txt4
-rw-r--r--npc/sample/monster_controller.txt (renamed from npc/sample/monster_controller.cpp)0
5 files changed, 5 insertions, 4 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 39ebaea33..76ee0105c 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2007/08/15
+ * Fixed 'Job_Professer' typo in mage jobchange quest [ultramage]
* Rev. 11016 Corrected a few bugs in the Acolyte Job Quest. (Crashy) [L0ne_W0lf]
2007/08/14
* Deleted an Unnecessary "next;" on Rachel Guide. [Samuray22]
diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt
index 2be2c586d..5c9d35655 100644
--- a/npc/jobs/1-1/mage.txt
+++ b/npc/jobs/1-1/mage.txt
@@ -23,7 +23,7 @@
geffen_in,164,124,4 script Mage Guildsman 123,{
if (Upper == 1) {
- if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professer) {
+ if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) {
if (Class == Job_Novice_High) {
mes "[Mage Guildsman]";
mes "Whoa, long time no see! But weren't you supposed to be dead?";
diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index 34111186e..26234cc44 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -2083,7 +2083,7 @@ new_zone02,17,182,6 script Helper#2 84,{
mes "Field Combat Training can be";
mes "actually pretty dangerous for";
mes "new adventurers. Let me give you";
- mes "a little more strenght through the";
+ mes "a little more strength through the";
mes "power of my magic.";
next;
mes "[Elmeen]";
diff --git a/npc/quests/skills/monk_skills.txt b/npc/quests/skills/monk_skills.txt
index 456e64d63..e17eae2f0 100644
--- a/npc/quests/skills/monk_skills.txt
+++ b/npc/quests/skills/monk_skills.txt
@@ -411,9 +411,9 @@ prt_monk,129,263,3 script Monk 823,{
mes "and you're good.";
next;
mes "[Monk]";
- mes "If you have enough strenght";
+ mes "If you have enough strength";
mes "to kill Mandoragoras, it means";
- mes "you have heart and strenght";
+ mes "you have heart and strength";
mes "to defeat other monsters";
mes "that pester the innocent";
mes "travelers.";
diff --git a/npc/sample/monster_controller.cpp b/npc/sample/monster_controller.txt
index 4d368467c..4d368467c 100644
--- a/npc/sample/monster_controller.cpp
+++ b/npc/sample/monster_controller.txt