diff options
| -rw-r--r-- | conf/map/maps.conf | 1 | ||||
| -rw-r--r-- | db/map_index.txt | 21 | ||||
| -rw-r--r-- | maps/re/012-1.mcache | bin | 980 -> 977 bytes | |||
| -rw-r--r-- | maps/re/012-6.mcache | bin | 0 -> 106 bytes | |||
| -rw-r--r-- | npc/012-1/_warps.txt | 1 | ||||
| -rw-r--r-- | npc/012-6/_import.txt | 4 | ||||
| -rw-r--r-- | npc/012-6/_warps.txt | 5 | ||||
| -rw-r--r-- | npc/012-6/nurse.txt | 106 | ||||
| -rw-r--r-- | npc/_import.txt | 1 |
9 files changed, 129 insertions, 10 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 0b8d166ef..d995d5475 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -53,6 +53,7 @@ map_list: ( "012-3", "012-4", "012-5", + "012-6", "014-1", "014-2", "015-1", diff --git a/db/map_index.txt b/db/map_index.txt index c600e1dca..4d886e8be 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -50,13 +50,14 @@ 012-3 50 012-4 51 012-5 52 -014-1 53 -014-2 54 -015-1 55 -boss 56 -botcheck 57 -sec_pri 58 -soren-2 59 -soren 60 -test 61 -testbg 62 +012-6 53 +014-1 54 +014-2 55 +015-1 56 +boss 57 +botcheck 58 +sec_pri 59 +soren-2 60 +soren 61 +test 62 +testbg 63 diff --git a/maps/re/012-1.mcache b/maps/re/012-1.mcache Binary files differindex 19bd69825..fcd3fadc8 100644 --- a/maps/re/012-1.mcache +++ b/maps/re/012-1.mcache diff --git a/maps/re/012-6.mcache b/maps/re/012-6.mcache Binary files differnew file mode 100644 index 000000000..99416f93f --- /dev/null +++ b/maps/re/012-6.mcache diff --git a/npc/012-1/_warps.txt b/npc/012-1/_warps.txt index 4de3bd504..b9d0e17be 100644 --- a/npc/012-1/_warps.txt +++ b/npc/012-1/_warps.txt @@ -8,3 +8,4 @@ 012-1,101,55,0 warp #012-1_101_55 0,0,012-4,35,30 012-1,121,71,0 warp #012-1_121_71 0,0,012-5,34,36 012-1,116,66,0 warp #012-1_116_66 0,0,012-5,23,26 +012-1,110,56,0 warp #012-1_110_56 0,0,012-6,58,68 diff --git a/npc/012-6/_import.txt b/npc/012-6/_import.txt new file mode 100644 index 000000000..c690c7709 --- /dev/null +++ b/npc/012-6/_import.txt @@ -0,0 +1,4 @@ +// Map 012-6: Hurnscald Hospital +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/012-6/_warps.txt", +"npc/012-6/nurse.txt", diff --git a/npc/012-6/_warps.txt b/npc/012-6/_warps.txt new file mode 100644 index 000000000..6ee0897c2 --- /dev/null +++ b/npc/012-6/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-6: Hurnscald Hospital warps +012-6,58,69,0 warp #012-6_58_69 0,0,012-1,110,57 +012-6,64,64,0 warp #012-6_64_64 1,0,012-6,28,32 +012-6,28,33,0 warp #012-6_28_33 1,0,012-6,64,65 diff --git a/npc/012-6/nurse.txt b/npc/012-6/nurse.txt new file mode 100644 index 000000000..a6d8b4616 --- /dev/null +++ b/npc/012-6/nurse.txt @@ -0,0 +1,106 @@ +// TMW-2 Script +// Author: +// Jesusalva +// Crazyfefe + +012-6,56,67,6 script Hurnscald's Nurse NPC_FEMALE,{ + + //if (sc_check(SC_POISON)) goto L_CurePoison; + if (Hp < (MaxHp/100*90)) goto L_Heal; + + mesn; + mesq l("Ah! Welcome. I can cure you, if you need."); + + do + { + select + rif(Hp < MaxHp, l("Please heal me!")), + l("I'm fine, no worries..."); + + switch (@menu) { + case 1: + goto L_Menu; + break; + case 2: + goto L_Close; + break; + } + } while (@menu != 2); + close; + +L_Heal: + mes ""; + mesn; + .@temp = rand(4); + if(.@temp == 1) goto L_Heal2; + if(.@temp == 2) goto L_Heal3; + if(.@temp == 3) goto L_Heal4; + goto L_Heal1; + + +L_Heal1: + mesq l("You don't look too well; let me treat your wounds."); + mes ""; + goto L_Menu; + +L_Heal2: + mesq l("I will make quick work of your wounds."); + mes ""; + goto L_Menu; + +L_Heal3: + mesq l("Need a healing?"); + mes ""; + goto L_Menu; + +L_Heal4: + mesq l("Sometimes you just need to run from battle."); + mes ""; + goto L_Menu; + +L_Menu: + .@price=(MaxHp-Hp)/6; + .@price=.@price+10; + if (BaseLevel <= 15) .@price=(.@price/10); + else if (BaseLevel <= 20) .@price=(.@price/5); + else .@price=(.@price/2); + mesq l("For you, it'll be @@ GP.", .@price); + mes ""; + menu + rif(Zeny >= .@price, l("Please heal me!")), L_Heal_L, + l("Another time, maybe."), L_Close; + + +L_Heal_L: + mes ""; + set Zeny, Zeny - .@price; + sc_end(SC_POISON); + sc_end(SC_SLOWPOISON); + percentheal 100,100; // We can also use "recovery(<account id>)" + mesn; + @temp = rand(1,4); + if(@temp == 1) mesq l("Here you go!"); + if(@temp == 2) mesq l("Painless, wasn't it?"); + if(@temp == 3) mesq l("You should be more careful."); + if(@temp == 4) mesq l("Much better, right?!"); + goto L_Close; + + +L_Close: + close; + +OnInit: + .@npcId = getnpcid(0, .name$); + // I am too lazy to dress every NPC I add >.< + setunitdata(.@npcId, UDT_HEADMIDDLE, ShortTankTop); + setunitdata(.@npcId, UDT_HEADMIDDLE, MiniSkirt); + setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); + setunitdata(.@npcId, UDT_HAIRSTYLE, 12); + setunitdata(.@npcId, UDT_HAIRCOLOR, 16); + + .sex = G_FEMALE; + .distance = 5; + end; + +} + diff --git a/npc/_import.txt b/npc/_import.txt index 970ee235c..766deab92 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -52,6 +52,7 @@ @include "npc/012-3/_import.txt" @include "npc/012-4/_import.txt" @include "npc/012-5/_import.txt" +@include "npc/012-6/_import.txt" @include "npc/014-1/_import.txt" @include "npc/014-2/_import.txt" @include "npc/015-1/_import.txt" |