Browse Source

* Added warg rider check to custom breeder (custom\breeder.txt)
* Follow-up r16656, documented the new commands

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

euphyy 12 years ago
parent
commit
035080c11e
3 changed files with 7 additions and 5 deletions
  1. 3 1
      doc/atcommands.txt
  2. 2 2
      npc/custom/breeder.txt
  3. 2 2
      npc/merchants/renters.txt

+ 3 - 1
doc/atcommands.txt

@@ -181,6 +181,7 @@ hidenpc: Hides a NPC.
 shownpc: Unhides a NPC.
 shownpc: Unhides a NPC.
 loadnpc: Loads an NPC script by path.
 loadnpc: Loads an NPC script by path.
 unloadnpc: Unloads a NPC.
 unloadnpc: Unloads a NPC.
+unloadnpcfile: Unloads all NPCs in a file.
 npcmove: Move a NPC.
 npcmove: Move a NPC.
 skillon: Turn skills on for a map
 skillon: Turn skills on for a map
 skilloff: Turn skills off for a map
 skilloff: Turn skills off for a map
@@ -205,7 +206,8 @@ reloadbattleconf: Reload battle config (admin command) Note that some player con
 reloadstatusdb: Reload status database (admin command)
 reloadstatusdb: Reload status database (admin command)
 reloadpcdb: Reload player info database (admin command)
 reloadpcdb: Reload player info database (admin command)
 reloadmotd: Reload the Message of the Day (admin command)
 reloadmotd: Reload the Message of the Day (admin command)
-adjgroup: Changes the group of another character (lasts until relog)
+adjgroup: Changes the group of a character (lasts until relog)
+addperm, rmvperm: Changes the permissions of a character (lasts until relog)
 disguiseall, undisguiseall: [Un]Disguise All Players (admin command)
 disguiseall, undisguiseall: [Un]Disguise All Players (admin command)
 mutearea: Mutes every player on screen (admin command)
 mutearea: Mutes every player on screen (admin command)
 battleignore: Makes you immune to attacks (monsters/players/skills cannot target/hit you, admin command)
 battleignore: Makes you immune to attacks (monsters/players/skills cannot target/hit you, admin command)

+ 2 - 2
npc/custom/breeder.txt

@@ -15,7 +15,7 @@ prontera,124,201,1	script	Universal Rental NPC	726,{
 		message strcharinfo(0),"You must first remove your mount.";
 		message strcharinfo(0),"You must first remove your mount.";
 		close; }
 		close; }
 	else if ((eaclass()&EAJ_THIRDMASK==EAJ_RANGER) && !countitem(6124)) {
 	else if ((eaclass()&EAJ_THIRDMASK==EAJ_RANGER) && !countitem(6124)) {
-		if (!checkfalcon() && getskilllv("HT_FALCON") && !checkwug()) {
+		if (!checkfalcon() && getskilllv("HT_FALCON") && !checkoption(Option_Wug) && !checkoption(Option_Wugrider)) {
 			if(select(" ~ Falcon: ~ Warg")==1) setfalcon;
 			if(select(" ~ Falcon: ~ Warg")==1) setfalcon;
 			else getitem 6124,1; }
 			else getitem 6124,1; }
 		else getitem 6124,1; }
 		else getitem 6124,1; }
@@ -25,7 +25,7 @@ prontera,124,201,1	script	Universal Rental NPC	726,{
 			else setmadogear; }
 			else setmadogear; }
 		else setcart; }
 		else setcart; }
 	else if (!checkcart() && getskilllv("MC_PUSHCART")) setcart;
 	else if (!checkcart() && getskilllv("MC_PUSHCART")) setcart;
-	else if (!checkfalcon() && getskilllv("HT_FALCON") && !checkwug()) setfalcon;
+	else if (!checkfalcon() && getskilllv("HT_FALCON") && !checkoption(Option_Wug) && !checkoption(Option_Wugrider)) setfalcon;
 	else if (!checkriding() && getskilllv("KN_RIDING")) {
 	else if (!checkriding() && getskilllv("KN_RIDING")) {
 		if (eaclass()&EAJ_THIRDMASK==EAJ_RUNE_KNIGHT) setdragon;
 		if (eaclass()&EAJ_THIRDMASK==EAJ_RUNE_KNIGHT) setdragon;
 		else setriding; }
 		else setriding; }

+ 2 - 2
npc/merchants/renters.txt

@@ -162,7 +162,7 @@ hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
 		if (checkoption(Option_Wug) || checkoption(Option_Wugrider)) {
 		if (checkoption(Option_Wug) || checkoption(Option_Wugrider)) {
 			mes "Um...";
 			mes "Um...";
 			mes "You can't rent a Falcon";
 			mes "You can't rent a Falcon";
-			mes "untill you dismiss your warg first!";
+			mes "until you dismiss your warg first!";
 			close;
 			close;
 		}
 		}
 		mes "Do you need a Falcon?";
 		mes "Do you need a Falcon?";
@@ -176,7 +176,7 @@ hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
 				mes "[Falcon Breeder]";
 				mes "[Falcon Breeder]";
 				mes "Um...";
 				mes "Um...";
 				mes "You can't rent a Falcon";
 				mes "You can't rent a Falcon";
-				mes "untill you dismiss your warg first!";
+				mes "until you dismiss your warg first!";
 				close;
 				close;
 			}
 			}
 			if (zeny < .@price) {
 			if (zeny < .@price) {