diff options
author | shennetsind <notind@gmail.com> | 2013-05-17 11:08:38 -0700 |
---|---|---|
committer | shennetsind <notind@gmail.com> | 2013-05-17 11:08:38 -0700 |
commit | 080f7a22740225df70a488849587b462a5d6b1a3 (patch) | |
tree | 0c1dc751af9f06e1ce3729d271de301f78a4e611 /npc/kafras | |
parent | 754af15505f32237f8063e51ae9a1cb90788dff4 (diff) | |
parent | 25e848f1a0f9317d63106cae048a1ef838411cb2 (diff) | |
download | hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.gz hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.bz2 hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.xz hercules-080f7a22740225df70a488849587b462a5d6b1a3.zip |
Merge pull request #1 from Earisu/master
updating, with earisu's
Diffstat (limited to 'npc/kafras')
-rw-r--r-- | npc/kafras/cool_event_corp.txt | 4 | ||||
-rw-r--r-- | npc/kafras/dts_warper.txt | 4 | ||||
-rw-r--r-- | npc/kafras/functions_kafras.txt | 6 | ||||
-rw-r--r-- | npc/kafras/kafras.txt | 4 |
4 files changed, 6 insertions, 12 deletions
diff --git a/npc/kafras/cool_event_corp.txt b/npc/kafras/cool_event_corp.txt index 853d15cbc..4a8f8c188 100644 --- a/npc/kafras/cool_event_corp.txt +++ b/npc/kafras/cool_event_corp.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Cool Event Corp. Staff //===== By: ================================================== //= Gepard //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Cool Event Corp. Staff (Save, Storage & Pushcart Service) //= in Arunafeltz Region. diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt index 4e373a3fc..b2fb64ba8 100644 --- a/npc/kafras/dts_warper.txt +++ b/npc/kafras/dts_warper.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Dungeon Teleport Service //===== By: ================================================== //= Evera //===== Current Version: ===================================== //= 2.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Cool Event Corp NPCs vs. Kafra Dungeon Teleport Service and voting system. diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index c1e7d25ee..c3df4e0af 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kafra Functions //===== By: ================================================== //= rAthena Dev Team @@ -6,8 +6,6 @@ //= L0ne_W0lf //===== Current Version: ===================================== //= 6.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= These functions handle save, storage, cart rental, teleport, //= and Free Teleport/Warp/Rent Cart options for all Kafra NPCs. @@ -143,6 +141,8 @@ function script F_Kafra { case 8: setarray @K_Menu0$[0],"Save","Use Storage","Check Other Information","Cancel"; break; // No Save (Rune Knight) case 9: setarray @K_Menu0$[0],"Use Storage","Rent a Pushcart","Use Teleport Service","Check Other Information","Cancel"; break; + // Storage, Save, and Pushcart (Dewata, reorder of case 7) + case 10: setarray @K_Menu0$[0],"Use Storage","Save","Rent a Pushcart","Cancel"; break; // Default message (obsolete) default: setarray @K_Menu0$[0],"Save","Use Storage","Use Teleport Service","Rent a Pushcart","Check Other Information","Cancel"; break; } diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt index 8e6d49c8a..49562e3be 100644 --- a/npc/kafras/kafras.txt +++ b/npc/kafras/kafras.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kafras (Cities/Dungeons/Fields) //===== By: ================================================== //= Joseph //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Argument settings for callfunc "F_Kafra": //= arg(0): 0 - Default Kafra message |