diff options
Diffstat (limited to 'npc')
-rw-r--r-- | npc/003-1/silvia.txt | 32 | ||||
-rw-r--r-- | npc/003-10/_import.txt | 1 | ||||
-rw-r--r-- | npc/003-10/arnea.txt (renamed from npc/003-5/arnea.txt) | 0 | ||||
-rw-r--r-- | npc/003-5/_import.txt | 1 | ||||
-rw-r--r-- | npc/004-1/elanore.txt | 7 |
5 files changed, 36 insertions, 5 deletions
diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt index 666427a7b..fcb8af072 100644 --- a/npc/003-1/silvia.txt +++ b/npc/003-1/silvia.txt @@ -7,7 +7,7 @@ if (strcharinfo(0) == $MOST_HEROIC$) npctalk l("Oh my, the great @@ has come to talk to me!", $MOST_HEROIC$); if (getq(TulimsharQuest_Swezanne) == 4) goto L_Message; -if (getq(TulimsharQuest_Swezanne) == 1) goto L_Lifestone; +if (getq(TulimsharQuest_Swezanne) == 1 && getq(TulimsharQuest_Lifestone) < 2) goto L_Lifestone; if (getq(TulimsharQuest_Swezanne) == 2) goto L_Unallowed; if (strcharinfo(0) != $MOST_HEROIC$) hello; end; @@ -39,7 +39,30 @@ L_Lifestone: next; mesn; mesq l("I can make you a @@, and for that I will want a @@ and 500 GP.", getitemlink(LifestonePendant), getitemlink(Lifestone)); - mes col("And I also need Jesusalva to authorize the usage of regenerative items.",1); + if (getq(TulimsharQuest_Lifestone) == 0) { + next; + mesn; + mesq l("I am not sure of who makes or haves Lifestones. Try looking outside the city. Who knows."); + close; + } + menu + rif(Zeny >= 500 && countitem(Lifestone) > 0, l("Yes, I accept the pendant!")), -, + l("Not now, but I may be back later."), L_Close; + + // Whaaaat, this is a major error affecting several scripts! + if (Zeny < 500 || countitem(Lifestone) < 0) { + atcommand("@request Someone is cheating, call Jesusalva at once!"); + atcommand("@ban \""+strcharinfo(0)+"\" 15mn"); // I truly hope they bother Jesusalva they were banned + disablenpc "Silvia"; + close; + } + Zeny-=500; + delitem Lifestone, 1; + getitem LifestonePendant, 1; + setq(TulimsharQuest_Lifestone, 2); + mes ""; + mesn; + mesq l("There you go! Thanks for all the help!"); close; L_Unallowed: @@ -50,6 +73,11 @@ L_Unallowed: mesq l("She must be thristy, fighting monsters on this sun... If somebody could give her Cactus Potions..."); close; +L_Close: + closedialog; + goodbye; + close; + OnInit: .@npcId = getnpcid(0, .name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); diff --git a/npc/003-10/_import.txt b/npc/003-10/_import.txt index 215053cd4..357bb6e77 100644 --- a/npc/003-10/_import.txt +++ b/npc/003-10/_import.txt @@ -1,3 +1,4 @@ // Map 003-10: Guard's House // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/003-10/_warps.txt", +"npc/003-10/arnea.txt", diff --git a/npc/003-5/arnea.txt b/npc/003-10/arnea.txt index a55db1fd0..a55db1fd0 100644 --- a/npc/003-5/arnea.txt +++ b/npc/003-10/arnea.txt diff --git a/npc/003-5/_import.txt b/npc/003-5/_import.txt index f768ea85f..62309d1f9 100644 --- a/npc/003-5/_import.txt +++ b/npc/003-5/_import.txt @@ -1,4 +1,3 @@ // Map 003-5: Tulimshar Jeweler // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/003-5/arnea.txt", "npc/003-5/doors.txt", diff --git a/npc/004-1/elanore.txt b/npc/004-1/elanore.txt index 1278b0ad7..1ca855e52 100644 --- a/npc/004-1/elanore.txt +++ b/npc/004-1/elanore.txt @@ -85,8 +85,11 @@ L_Trade: getitem Lifestone, 1; - // Possible enhancement: Only grant Experience on first craft - getexp 40, 0; + // Only grant Experience on first craft + if (getq(TulimsharQuest_Lifestone) == 0) { + setq TulimsharQuest_Lifestone, 1; + getexp 80, 10; + } mesn; mesq l("These will do just fine."); next; |