diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-28 21:21:45 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-28 21:21:45 +0000 |
| commit | df3489bd7cd6da79c1654d97600aa7f3ba213fd3 (patch) | |
| tree | 06a186f1fc9c07c1c6f729125054bdfb3bfb0c0b | |
| parent | d93e35f0130d7ee50948fcc3f2711210f32b34b2 (diff) | |
| download | hercules-df3489bd7cd6da79c1654d97600aa7f3ba213fd3.tar.gz hercules-df3489bd7cd6da79c1654d97600aa7f3ba213fd3.tar.bz2 hercules-df3489bd7cd6da79c1654d97600aa7f3ba213fd3.tar.xz hercules-df3489bd7cd6da79c1654d97600aa7f3ba213fd3.zip | |
- Added a missing 'next' in Kiel Hyre Quest (Medicine Chest).
- Fixed a type in Mjolnir Seal quest (Dwarf Blacksmith#south).
- Fixed wrong parameters in 'areapercentheal'. (bugreport:3428)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13976 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | npc/quests/Kiel_Hyre_Quest.txt | 1 | ||||
| -rw-r--r-- | npc/quests/seals/mjolnir_seal.txt | 4 | ||||
| -rw-r--r-- | src/map/script.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt index 13fa73fd6..42da8f8f7 100644 --- a/npc/quests/Kiel_Hyre_Quest.txt +++ b/npc/quests/Kiel_Hyre_Quest.txt @@ -3049,6 +3049,7 @@ kh_vila,123,170,0 script Medicine Chest#khp1 111,{ mes "ink on the blank piece of paper"; mes "with the Kiel Hyre Foundation"; mes "seal. Would you like read it?^000000"; + next; switch(select("No time!:Read")) { case 1: mes "^3355FFYou're running out of"; diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt index 0f8a6d800..5941b4330 100644 --- a/npc/quests/seals/mjolnir_seal.txt +++ b/npc/quests/seals/mjolnir_seal.txt @@ -1275,7 +1275,7 @@ mjolnir_09,209,341,3 script Dwarf Blacksmith#south 826,{ specialeffect2 EF_CRASHEARTH; set .@p_vit,.@p_vit - 30; mes "You've taken"; - mes "critical .@damage"; + mes "critical damage"; mes "on your weak spot!"; mes "--------------------"; mes "" + strcharinfo(0) + " has lost 30 HP!"; @@ -1682,7 +1682,7 @@ mjolnir_09,209,341,3 script Dwarf Blacksmith#south 826,{ specialeffect2 EF_CRASHEARTH; set .@p_vit,.@p_vit - 30; mes "You've taken"; - mes "critical .@damage"; + mes "critical damage"; mes "on your weak spot!"; mes "--------------------"; mes "" + strcharinfo(0) + " has lost 30 HP!"; diff --git a/src/map/script.c b/src/map/script.c index 184e9121c..3a74c5d00 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -4140,8 +4140,8 @@ BUILDIN_FUNC(areapercentheal) y0=script_getnum(st,4); x1=script_getnum(st,5); y1=script_getnum(st,6); - hp=script_getnum(st,8); - sp=script_getnum(st,9); + hp=script_getnum(st,7); + sp=script_getnum(st,8); if( (m=map_mapname2mapid(mapname))< 0) return 0; |