Prechádzať zdrojové kódy

- Patched the MAX_STATUSCHANGE startup error
- Fixed a compiler warning
- Really removed duplicate Noyee npc

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

ultramage 18 rokov pred
rodič
commit
c9ee6987e6
5 zmenil súbory, kde vykonal 5 pridanie a 30 odobranie
  1. 1 0
      Changelog-Trunk.txt
  2. 2 0
      npc/Changelog.txt
  3. 0 28
      npc/cities/yuno.txt
  4. 1 1
      npc/jobs/2-2/dancer.txt
  5. 1 1
      src/map/map.h

+ 1 - 0
Changelog-Trunk.txt

@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2007/03/20
+	* Patched the MAX_STATUSCHANGE startup error [ultramage]
 	* Removed the last argument from script command skillitem.
 	* Added skill ITEM_ENCHANTARMS, this is what weapon enchanting items should
 	  use.

+ 2 - 0
npc/Changelog.txt

@@ -26,6 +26,8 @@ KarLaeda
 
 Date		Added
 ======
+2007/03/20
+	* Removed duplicate Noyee npc (skipped in r9943 ?)
 2007/03/17
 	* Fixed a missing curly brace and removed some more .gat-s [ultramage]
 	* Removed all .gat from the scripts [Lupus]

+ 0 - 28
npc/cities/yuno.txt

@@ -50,34 +50,6 @@ yuno,208,164,4	script	Active little girl	101,{
 }
 
 
-//======================================================================================
-yuno,164,200,4	script	Noyee	101,{
-	mes "[Noyee]";
-	mes "Did you know that there's a";
-	mes "difference between the armor you";
-	mes "can buy from NPC shops and the";
-	mes "kinds you obtain from hunting";
-	mes "monsters?";
-	next;
-	mes "[Noyee]";
-	mes "The difference, my friend, is in";
-	mes "the number of ^5533FFslots^000000 in your armor.";
-	next;
-	mes "[Noyee]";
-	mes "The same kind of Armor will have";
-	mes "the same Defense. However, if an";
-	mes "Armor has a slot, you can insert a";
-	mes "Monster Card which will add an";
-	mes "enhancement to that armor.";
-	next;
-	mes "[Noyee]";
-	mes "Both Monster Cards and Slotted";
-	mes "Armors are rarely dropped by";
-	mes "monsters, and are thus valuable";
-	mes "commodies.";
-	close;
-}
-
 //======================================================================================
 yuno,184,173,4	script	Freidrich	729,{
 	mes "[Freidrich]";

+ 1 - 1
npc/jobs/2-2/dancer.txt

@@ -310,7 +310,7 @@ job_duncer,95,93,4	script	Bijou	101,{
 		if(@gift==50) {
 			getitem 1953,1;
 			mes "Since you are very experienced I have given you a Line, instead of a simple Rope that normal people would get.";
-			mes "Now take you Line, and be the best Dancer you can be!";
+			mes "Now take your Line, and be the best Dancer you can be!";
 		} else {
 			getitem 1950,1;
 	 		mes "Now take this Rope, and be the best Dancer you can be!";

+ 1 - 1
src/map/map.h

@@ -31,7 +31,7 @@
 #define LIFETIME_FLOORITEM 60
 #define DAMAGELOG_SIZE 30
 #define LOOTITEM_SIZE 10
-#define MAX_STATUSCHANGE 250
+#define MAX_STATUSCHANGE 251
 //Quick defines to know which are the min-max common ailments. [Skotlex]
 //Because of the way the headers are included.. these must be replaced for actual values.
 //Remember to update as needed! Min is SC_STONE and max is SC_DPOISON currently.