From 78fd470e61d794a859580e932452c8657e317280 Mon Sep 17 00:00:00 2001 From: mc_cameri Date: Tue, 7 Dec 2004 21:14:15 +0000 Subject: git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@499 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Dev/bugs.txt | 5 +++++ conf-tmpl/map_athena.conf | 3 +++ npc/Changelog.txt | 9 ++++++--- npc/other/mc_cameri/heal.txt | 30 ++++++++++++++++++++++++++++++ npc/warps/cities/aldebaran.txt | 2 +- 5 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 npc/other/mc_cameri/heal.txt diff --git a/Dev/bugs.txt b/Dev/bugs.txt index 742fd71e2..b74efb5e4 100644 --- a/Dev/bugs.txt +++ b/Dev/bugs.txt @@ -84,3 +84,8 @@ Progress: 0% Problem: MVP cast spells w/o showing "prepare cast line" Assigned: N/A Progress: 0% + +Problem: Line 130 in item_db.txt is giving error. +Note: This is the whole line: 658,Tribal_Solidarity,Tribal Solidarity,2,1000,0,500,,,,,10477567,2,,,,,{ guildgetexp rand(1,10000); },{} +Assigned: N/A +Progress: 0% \ No newline at end of file diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf index ed09d6dce..38dd1c3a3 100644 --- a/conf-tmpl/map_athena.conf +++ b/conf-tmpl/map_athena.conf @@ -342,6 +342,9 @@ npc: npc/other/poetry/ayothaya.txt //= MC Cameri's Bank NPC //npc: npc/other/mc_cameri/bank.txt +//= MC Cameri's Heal NPC +//npc: npc/other/mc_Cameri/heal.txt + //-------------------------- Guild Wars --------------------------------- //Guild Wars: General diff --git a/npc/Changelog.txt b/npc/Changelog.txt index f0b29e380..f1d819d65 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -30,10 +30,13 @@ Other Ppl Date Added ====== -12/07 Fixed all Newgear quests: arjen.txt,back_ribbon.txt,bear_hat.txt,burning_blood_bandana.txt,cat_hairband.txt +12/07 + * Added npc/other/mc_cameri/heal.txt, a heal npc that is as simple as one click healing [MC Cameri] + * Fixed Al De Baran to Mjolnir warp in Al De Baran [MC Cameri] + * Fixed all Newgear quests: arjen.txt,back_ribbon.txt,bear_hat.txt,burning_blood_bandana.txt,cat_hairband.txt fox_mask.txt,hat_seller.txt,indian_headband.txt,mask_of_alarm.txt,mushroom_hairband.txt,neris.txt - old_blacksmith.txt,posture_fix_hat.txt,sea_otter_hat.txt,traveler.txt,tulip_hairpin.txt - Fixed missing labels, missing delitem, wrong zeny amount, wrong items id, spelling [Lupus] + old_blacksmith.txt,posture_fix_hat.txt,sea_otter_hat.txt,traveler.txt,tulip_hairpin.txt [Lupus] + * Fixed missing labels, missing delitem, wrong zeny amount, wrong items id, spelling [Lupus] * Added Fox Mask quest. [Mass Zero] 12/06 * Added seperate quests for the new headgears, missing Fox Mask and Orc Hero Helm. (I'll so 'em ASAP.) [Mass Zero] diff --git a/npc/other/mc_cameri/heal.txt b/npc/other/mc_cameri/heal.txt new file mode 100644 index 000000000..b99eb03e2 --- /dev/null +++ b/npc/other/mc_cameri/heal.txt @@ -0,0 +1,30 @@ +//===== eAthena Script ======================================= +//= Heal Npc +//===== By: ================================================== +//= MC Cameri +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= eAthena 0.1+; +//===== Description: ========================================= +//= Poring Which Heals For Free +//===== Additional Comments: ================================= +//= You can use this one if you want simple one-click healing +//============================================================ + +prontera.gat,150,184,5 script Healring::Healring0 1002,{ + npctalk "Booing!"; + emotion 21; + percentheal 100,100; +} + +morocc.gat,159,96,5 duplicate(Healring0) Healring 1002 +geffen.gat,121,61,5 duplicate(Healring0) Healring 1002 +payon.gat,180,105,5 duplicate(Healring0) Healring 1002 +alberta.gat,185,144,5 duplicate(Healring0) Healring 1002 +aldebaran.gat,134,123,5 duplicate(Healring0) Healring 1002 +izlude.gat,125,118,5 duplicate(Healring0) Healring 1002 +xmas.gat,149,136,5 duplicate(Healring0) Healring 1002 +comodo.gat,188,162,5 duplicate(Healring0) Healring 1002 +amatsu.gat,200,80,5 duplicate(Healring0) Healring 1002 +gonryun.gat,164,130,5 duplicate(Healring0) Healring 1002 \ No newline at end of file diff --git a/npc/warps/cities/aldebaran.txt b/npc/warps/cities/aldebaran.txt index 8523cf5a8..7376c21fa 100644 --- a/npc/warps/cities/aldebaran.txt +++ b/npc/warps/cities/aldebaran.txt @@ -15,7 +15,7 @@ //===== Al De Baran Warps ===================================== aldebaran.gat,118,63,0 warp ald01 1,1,aldeba_in.gat,211,117 -aldebaran.gat,138,34,0 warp ald001 2,2,mjolnir_12.gat,199,375 +aldebaran.gat,139,34,0 warp ald001 3,2,mjolnir_12.gat,199,375 aldebaran.gat,197,70,0 warp ald02 1,1,aldeba_in.gat,94,41 aldebaran.gat,225,54,0 warp ald03 1,1,aldeba_in.gat,149,120 aldebaran.gat,233,105,0 warp ald04 1,1,aldeba_in.gat,157,190 -- cgit v1.2.3-70-g09d2