summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-05-24 19:14:31 -0300
committerJesusaves <cpntb1@ymail.com>2018-05-24 19:14:31 -0300
commitd9740d2fad9975019cbe3735459da0ef184bdd54 (patch)
tree3fbabcab8dc89d8a97d85d5aeaff9992a8164e0a
parentea21e5bd9d1a8d996f6b1cb1f465d4091f2d95ac (diff)
downloadserverdata-d9740d2fad9975019cbe3735459da0ef184bdd54.tar.gz
serverdata-d9740d2fad9975019cbe3735459da0ef184bdd54.tar.bz2
serverdata-d9740d2fad9975019cbe3735459da0ef184bdd54.tar.xz
serverdata-d9740d2fad9975019cbe3735459da0ef184bdd54.zip
Alige quest can be accepted, and various changes related or not.
-rw-r--r--db/re/item_db.conf2
-rw-r--r--npc/002-1/alige.jesusalva8
-rw-r--r--npc/002-1/alige.txt35
-rw-r--r--npc/003-1/mahoud.txt9
-rw-r--r--npc/009-1/dangrostra.txt4
5 files changed, 41 insertions, 17 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 6c82efb37..874a222a8 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2271,7 +2271,7 @@ item_db: (
Type: "IT_HEALING"
Buy: 35
Sell: 15
- Weight:12
+ Weight: 12
WeaponLv: 0
EquipLv: 0
Refine: false
diff --git a/npc/002-1/alige.jesusalva b/npc/002-1/alige.jesusalva
index 8257982a8..662f92724 100644
--- a/npc/002-1/alige.jesusalva
+++ b/npc/002-1/alige.jesusalva
@@ -82,7 +82,7 @@ L_Ajuda:
mesn;
mes "\"Nossa! Muito obrigado! Te espero o quanto antes!\"";
next;
- mes "["+ strcharinfo(0) +"]";
+ mesn strcharinfo(0);
mes "\"Hey! Não entendi pq estes itens.\"";
next;
mesn;
@@ -96,7 +96,7 @@ L_Ajuda:
mes "\"Água e Coxas de Galinha para se alimentar durante o percuso e ir de clandestino no navio. "+
"Algunas poções pois nunca se sabe o que vou enfrentar e dinheiro para não andar liso. \"";
next;
- mes "["+ strcharinfo(0) +"]";
+ mesn strcharinfo(0);
mes "\"Você planejou bem. Vou pegar os itens...\"";
QUEST_ChapeuDeMarinheiro = 1;
close;
@@ -105,7 +105,7 @@ L_pegou:
mesn;
mes "\"Você já tem o que lhe pedi?\"";
next;
- mes "["+ strcharinfo(0) +"]";
+ mesn strcharinfo(0);
menu
"Sim, pode conferir.", L_ver,
"Vou avisar as autoridades... boa sorte na prisão.", L_Fechar;
@@ -193,7 +193,7 @@ L_Fim:
mes "[Mercador]";
mes "\"Estou por aqui... Mais já paguei pelos meus atos, agora estou de bem com tudo não preciso mais fugir...\"";
next;
- mes "["+ strcharinfo(0) +"]";
+ mesn strcharinfo(0);
mes "\"Por que será que eu não acredito nisso...\"";
close;
diff --git a/npc/002-1/alige.txt b/npc/002-1/alige.txt
index 90b3bd799..5f45d184e 100644
--- a/npc/002-1/alige.txt
+++ b/npc/002-1/alige.txt
@@ -9,7 +9,7 @@
// Jesusalva
// Description:
// Stowaway hidden in a ship's hole. Contrabandist. Trade potions, dyes,
-// food, water, and money for a hat.
+// food, water, and money for an item.
002-1,45,26,0 script Alige NPC_ALIGE,{
.@q=getq(ShipQuests_Alige);
@@ -45,16 +45,45 @@ L_GoGo:
next;
mesn l("Old Paper Patch");
mes l("* @@/30 @@", countitem(CactusPotion), getitemlink(CactusPotion));
- mes l("* @@/10.000 GP", Zeny);
+ mes l("* @@/12 @@", countitem(Bread), getitemlink(Bread));
+ mes l("* @@/12 @@", countitem(Cheese), getitemlink(Cheese));
+ mes l("* @@/8 @@", countitem(BottleOfTonoriWater), getitemlink(BottleOfTonoriWater));
+ mes l("* @@/6 @@", countitem(HastePotion), getitemlink(HastePotion));
+ mes l("* @@/6 @@", countitem(StrengthPotion), getitemlink(StrengthPotion));
+ mes l("* @@/2 @@", countitem(YellowCottonDye), getitemlink(YellowCottonDye));
+ mes l("* @@/2 @@", countitem(BlueCottonDye), getitemlink(BlueCottonDye));
+ mes l("* @@/7.500 GP", Zeny);
next;
+ // Temporary item. This four leaf amulet can be evolved: Bromenal < Iron < Golden < Crozenite
mesn;
- mesq l("In exchange for your help, I'll give you a @@!");
+ mesq l("In exchange for your help, I'll give you a @@!", getitemlink(BromenalFourLeafAmulet));
menu
l("Of course I'll help you!"), L_Accept,
l("Have you got mad? That's too much, it's like you are trying to be perfect! No way I'll help you!"), L_Close;
L_Accept:
mesn;
+ mesq l("\"Many thanks! I'll be waiting for you, hiding on the ship's hold!\"");
+ next;
+ mesn strcharinfo(0);
+ mesq l("Could you first explain me why so many items?");
+ next;
+ mesn;
+ mesq l("Very well, listen to my plan!");
+ next;
+ mesn;
+ mesq l("The dyes are to disguise myself, I don't want to get caught. The potions are for safety, who knows what I'll face?");
+ next;
+ mesn;
+ mesq l("Water, Bread and Cheese are to eat, and money is always useful, you know.");
+ next;
+ mesn strcharinfo(0);
+ mesq l("You planned neatly. I'll be back.");
+ setq ShipQuests_Alige, 1;
+ close;
+
+
+ mesn;
mesq l("Wait... I just remebered, I need to solve a problem first. So please come back later.");
close;
diff --git a/npc/003-1/mahoud.txt b/npc/003-1/mahoud.txt
index 36885dac5..4f684bb49 100644
--- a/npc/003-1/mahoud.txt
+++ b/npc/003-1/mahoud.txt
@@ -23,10 +23,7 @@
if (Zeny < .@Cost)
goto L_NotEnoughMoney;
getinventorylist;
- if (@inventorylist_count == 100
- && countitem("BottleOfSeaWater") == 0
- && .@empty > .@count)
- goto L_NotEnoughSlots;
+ inventoryplace BottleOfTonoriWater, .@count;
set Zeny, Zeny - .@Cost;
delitem "EmptyBottle", .@count;
@@ -41,10 +38,6 @@ L_NotEnoughMoney:
mes l("You don't have enough gp! You need @@ gp.", .@Cost);
close;
-L_NotEnoughSlots:
- mes l("You don't have room for these bottles!");
- close;
-
OnInit:
.sex = G_MALE;
.distance = 7;
diff --git a/npc/009-1/dangrostra.txt b/npc/009-1/dangrostra.txt
index 486910e4e..04e05528b 100644
--- a/npc/009-1/dangrostra.txt
+++ b/npc/009-1/dangrostra.txt
@@ -37,11 +37,12 @@ OnInit:
tradertype(NST_MARKET);
// Bows (rare)
- sellitem WoodenBow, 6800, 1;
sellitem ShortBow, 15200, 1;
+ sellitem WoodenBow, 6800, 1;
// Misc (uncommon)
sellitem SharpKnife, -1, 1;
sellitem EmptyBottle, -1, 1; // You can buy some empty bottles here, but they're scarse
+ sellitem BlueCottonDye, -1, 1;
// Arrows (common)
sellitem Arrow, -1, 250;
sellitem IronArrow, -1, 110;
@@ -56,6 +57,7 @@ OnClock0400:
OnClock1600:
restoreshopitem SharpKnife, -1, 1;
restoreshopitem EmptyBottle, -1, 1;
+ restoreshopitem BlueCottonDye, -1, 1;
OnClock0800:
OnClock2000:
restoreshopitem Arrow, -1, 200;