summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-15 16:39:08 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-15 16:39:08 +0000
commitfb6f98bcc3021d88cf642809c2eea5f5f7d72d91 (patch)
tree039afdd37e40befe514daed6f404198146744069
parent26c532c222acf2f68dfa41c3ce5fa1acd3898429 (diff)
downloadhercules-fb6f98bcc3021d88cf642809c2eea5f5f7d72d91.tar.gz
hercules-fb6f98bcc3021d88cf642809c2eea5f5f7d72d91.tar.bz2
hercules-fb6f98bcc3021d88cf642809c2eea5f5f7d72d91.tar.xz
hercules-fb6f98bcc3021d88cf642809c2eea5f5f7d72d91.zip
* Replaced "Universal Rental NPC" with a one-click automatic script that supports new mounts (custom\breeder.txt)
* End all status effects on skill reset, as per bugreport:6025 (custom\resetnpc.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16306 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/custom/breeder.txt73
-rw-r--r--npc/custom/resetnpc.txt5
2 files changed, 40 insertions, 38 deletions
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index d03928ad2..ea5c346a5 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -1,51 +1,50 @@
//===== rAthena Script =======================================
//= Universal Rental NPC
//===== By: ==================================================
-//= rAthena Dev Team
+//= Euphy
//===== Current Version: =====================================
-//= 1.3a
+//= 1.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
+//= One-click automatic mount rentals.
+//============================================================
+
+prontera,124,201,1 script Universal Rental NPC 726,{
+ if (ismounting()) {
+ 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(select(" ~ Falcon: ~ Warg")==1) setfalcon;
+ else getitem 6124,1; }
+ else getitem 6124,1; }
+ else if ((eaclass()&EAJ_THIRDMASK==EAJ_MECHANIC) && !checkcart() && getskilllv("MC_PUSHCART")) {
+ if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) {
+ if(select(" ~ Cart: ~ Mado")==1) setcart;
+ else setmadogear; }
+ else setcart; }
+ else if (!checkcart() && getskilllv("MC_PUSHCART")) setcart;
+ else if (!checkfalcon() && getskilllv("HT_FALCON") && !checkwug()) setfalcon;
+ else if (!checkriding() && getskilllv("KN_RIDING")) {
+ if (eaclass()&EAJ_THIRDMASK==EAJ_RUNE_KNIGHT) setdragon;
+ else setriding; }
+ else if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) setmadogear;
+ else {
+ message strcharinfo(0),"You do not meet requirements to rent.";
+ close; }
+ specialeffect2 276;
+ close;
+}
+
+//============================================================
+// Old changelog
+//============================================================
//= A Free PecoPeco and Falcon Breeder
-//===== Additional Comments: =================================
//= 1.1 FIXED checkriding/cart/falcon funcs [Lupus]
//= 1.2 Added Rebirth/Advanced Class support [Mass Zero]
//= 1.3 Simplified the checks of job [Silentdragon]
//= 1.3a Fixed a Typo Error. [Samuray22]
//= Thanks to ~AnnieRuru~.
//= 1.4 Optimized Script. No need for 50 million Labels. [Spre]
-//============================================================
-
-prontera,124,201,1 script Universal Rental Npc 726,{
- mes "[Universal Rental Npc]";
- mes "Hi, here you can rent Carts, Falcons or Pecopecos.";
- next;
- switch(select("Cart:Falcon:Peco")) {
- case 1:
- if((BaseClass == Job_Merchant || BaseJob == Job_SuperNovice) && checkcart() == 0 && getskilllv("MC_PUSHCART")>0) {
- setcart;
- } else {
- mes "[Universal Rental Npc]";
- mes "Sorry " + strcharinfo(0) + ", Please make sure you are the required job and have the required skill.";
- }
- break;
- case 2:
- if(BaseJob != Job_Archer && BaseClass == Job_Archer && checkfalcon() == 0 && getskilllv("HT_FALCON")>0) {
- setfalcon;
- } else {
- mes "[Universal Rental Npc]";
- mes "Sorry " + strcharinfo(0) + ", Please make sure you are the required job and have the required skill.";
- }
- break;
- case 3:
- if (BaseJob != Job_Swordman && BaseClass == Job_Swordman && checkriding() == 0 && getskilllv("KN_RIDING")>0) {
- setriding;
- } else {
- mes "[Universal Rental Npc]";
- mes "Sorry " + strcharinfo(0) + ", Please make sure you are the required job and have the required skill.";
- }
- break;
- }
- close;
-}
+//============================================================ \ No newline at end of file
diff --git a/npc/custom/resetnpc.txt b/npc/custom/resetnpc.txt
index bc7132651..c0839212c 100644
--- a/npc/custom/resetnpc.txt
+++ b/npc/custom/resetnpc.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Current Version: =====================================
-//= 1.1
+//= 1.3
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -12,6 +12,7 @@
//= 1.0 First Version
//= 1.1 Optimized for the greater good. [Kisuka]
//= 1.2 Cleaning [Euphy]
+//= 1.3 All statuses removed upon skill reset. [Euphy]
//============================================================
prontera,150,193,4 script Reset Girl 124,{
@@ -34,6 +35,7 @@ prontera,150,193,4 script Reset Girl 124,{
mes "Sorry, you don't have enough Zeny.";
close; }
set Zeny, Zeny-.@ResetSkill;
+ sc_end SC_ALL;
ResetSkill;
mes "There you go!";
close;
@@ -52,6 +54,7 @@ prontera,150,193,4 script Reset Girl 124,{
mes "Sorry, you don't have enough Zeny.";
close; }
set Zeny, Zeny-.@ResetBoth;
+ sc_end SC_ALL;
ResetSkill;
ResetStatus;
mes "There you go!";