diff options
| author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-24 15:24:23 +0000 |
|---|---|---|
| committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-24 15:24:23 +0000 |
| commit | a719ab47c9bd89869dc2840d83216edbe4d66f5c (patch) | |
| tree | dd51b5ee7696a478b854eb4deb72597549fc3b1d | |
| parent | a531c64908deb1fe407462e88fa7427230e6b254 (diff) | |
| download | hercules-a719ab47c9bd89869dc2840d83216edbe4d66f5c.tar.gz hercules-a719ab47c9bd89869dc2840d83216edbe4d66f5c.tar.bz2 hercules-a719ab47c9bd89869dc2840d83216edbe4d66f5c.tar.xz hercules-a719ab47c9bd89869dc2840d83216edbe4d66f5c.zip | |
* Added warg rider check to custom breeder (custom\breeder.txt)
* Follow-up r16656, documented the new commands
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16698 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | doc/atcommands.txt | 4 | ||||
| -rw-r--r-- | npc/custom/breeder.txt | 4 | ||||
| -rw-r--r-- | npc/merchants/renters.txt | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/doc/atcommands.txt b/doc/atcommands.txt index e4614e59b..2983e0316 100644 --- a/doc/atcommands.txt +++ b/doc/atcommands.txt @@ -181,6 +181,7 @@ hidenpc: Hides a NPC. shownpc: Unhides a NPC. loadnpc: Loads an NPC script by path. unloadnpc: Unloads a NPC. +unloadnpcfile: Unloads all NPCs in a file. npcmove: Move a NPC. skillon: Turn skills on 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) reloadpcdb: Reload player info database (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) mutearea: Mutes every player on screen (admin command) battleignore: Makes you immune to attacks (monsters/players/skills cannot target/hit you, admin command) diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index ea5c346a5..c280fae73 100644 --- a/npc/custom/breeder.txt +++ b/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."; close; } 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; else getitem 6124,1; } else getitem 6124,1; } @@ -25,7 +25,7 @@ prontera,124,201,1 script Universal Rental NPC 726,{ else setmadogear; } else 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")) { if (eaclass()&EAJ_THIRDMASK==EAJ_RUNE_KNIGHT) setdragon; else setriding; } diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index 922aa088d..bcaded6f6 100644 --- a/npc/merchants/renters.txt +++ b/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)) { mes "Um..."; mes "You can't rent a Falcon"; - mes "untill you dismiss your warg first!"; + mes "until you dismiss your warg first!"; close; } mes "Do you need a Falcon?"; @@ -176,7 +176,7 @@ hu_in01,381,304,5 script Falcon Breeder#hnt 105,{ mes "[Falcon Breeder]"; mes "Um..."; mes "You can't rent a Falcon"; - mes "untill you dismiss your warg first!"; + mes "until you dismiss your warg first!"; close; } if (zeny < .@price) { |