From f6aa539309218be5cfbc2cf5cae4e6e5cb94de4c Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 22 Jun 2018 18:11:10 -0300 Subject: Adjust travel prices Tulim<->Hurns. Move file. --- npc/004-1/anwar.txt | 7 +-- npc/016-1/_import.txt | 2 +- npc/016-1/captain.txt | 158 +++++++++++++++++++++++++++++++++++++++++++++++++ npc/016-1/marine.txt | 153 ----------------------------------------------- npc/functions/util.txt | 21 +++++-- 5 files changed, 176 insertions(+), 165 deletions(-) create mode 100644 npc/016-1/captain.txt delete mode 100644 npc/016-1/marine.txt (limited to 'npc') diff --git a/npc/004-1/anwar.txt b/npc/004-1/anwar.txt index e296a606c..7f9b83b5f 100644 --- a/npc/004-1/anwar.txt +++ b/npc/004-1/anwar.txt @@ -8,12 +8,7 @@ 004-1,107,67,0 script Anwar NPC_RAIJIN,{ .@q=getq(TulimsharQuest_AnwarField); if (BaseLevel < 18) goto L_Weak; - /* - if (.@q >= 15) goto L_Done; - if (.@q >= 13) goto L_GiveEomie; - if (.@q >= 11) goto L_GiveTinris; - if (.@q == 10) goto L_GiftMaterial; - */ + if (.@q > 10) goto L_Complete; if (.@q == 10) goto L_SecondReward; if (.@q == 9) goto L_FirstReward; diff --git a/npc/016-1/_import.txt b/npc/016-1/_import.txt index 9dcb1e0ad..a0e48ac07 100644 --- a/npc/016-1/_import.txt +++ b/npc/016-1/_import.txt @@ -1,5 +1,5 @@ // Map 016-1: La Marine First Deck // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/016-1/_mobs.txt", +"npc/016-1/captain.txt", "npc/016-1/doors.txt", -"npc/016-1/marine.txt", diff --git a/npc/016-1/captain.txt b/npc/016-1/captain.txt new file mode 100644 index 000000000..e31c9fa28 --- /dev/null +++ b/npc/016-1/captain.txt @@ -0,0 +1,158 @@ +// TMW2 scripts. +// Authors: +// Jesusalva +// Description: +// Temporary, placeholder. + +016-1,19,29,0 script Captain NPC_NARD,{ + .@price=2000; + if (BaseLevel < 20) + goto L_TooWeak; + + mesn; + mesq l("Hi @@.", strcharinfo(0)); + next; + mesq l("You are currently at @@.", LOCATION$); + mes ""; + + menu + rif(LOCATION$ != "Tulim", l("To Tulimshar.")), L_TTulim, + rif(LOCATION$ != "Hurns", l("To Hurnscald.")), L_THurns, + l("No, I'll save my money."), -; + + close; + +L_THurns: + .@x=marine_reputation("Hurns"); + + if (.@x >= 5) + .@price-=1750; + else if (.@x >= 4) + .@price-=1600; + else if (.@x >= 3) + .@price-=1200; + else if (.@x >= 2) + .@price-=800; + else if (.@x >= 1) + .@price-=400; + + mes ""; + mesn; + mesq l("It'll cost you @@ GP.", .@price); + mes ""; + + if (Zeny < .@price) { + mes l("You still need @@ GP to afford it.", (.@price-Zeny)); + close; + } + + if (askyesno() != ASK_YES) + close; + + Zeny=Zeny-.@price; + PC_DEST$="Hurns"; + + mes ""; + mesn; + mesq l("Hurnscald? Small farming towns are always nice to visit."); + next; + mesq l("I was planning to go there soon, anyway. All aboard!"); + close2; + addtimer nard_time(PC_DEST$), "#MarineShip::OnEvent"; + @timer_navio_running = 1; + warp "016-6", 40, 32; + + // 10% base chance of Pirate Attack! + // Each level INCREASES this in 0.1%. + // So for a level 40 player, chances are 14%. + if (rand(1, 10000) < 1000+(BaseLevel*10)) + addtimer rand(3000,6000), "#MarineShipAttack::OnEvent"; + end; + + + + + + + + +L_TTulim: + .@x=marine_reputation("Tulim"); + + if (.@x >= 12) + .@price-=1750; + else if (.@x >= 10) + .@price-=1500; + else if (.@x >= 8) + .@price-=1000; + else if (.@x >= 6) + .@price-=750; + else if (.@x >= 4) + .@price-=500; + else if (.@x >= 2) + .@price-=250; + + mes ""; + mesn; + mesq l("It'll cost you @@ GP.", .@price); + mes ""; + + if (Zeny < .@price) { + mes l("You still need @@ GP to afford it.", (.@price-Zeny)); + close; + } + + if (askyesno() != ASK_YES) + close; + + Zeny=Zeny-.@price; + PC_DEST$="Tulim"; + @timer_navio_running = 1; + + mes ""; + mesn; + mesq l("Tulimshar, right? The oldest human city-state!"); + next; + mesq l("I was planning to go there soon, anyway. All aboard!"); + close2; + addtimer nard_time(PC_DEST$), "#MarineShip::OnEvent"; + @timer_navio_running = 1; + warp "016-6", 40, 32; + + // 10% base chance of Pirate Attack! + // Each level INCREASES this in 0.1%. + // So for a level 40 player, chances are 14%. + if (rand(1, 10000) < 1000+(BaseLevel*10)) + addtimer rand(3000,6000), "#MarineShipAttack::OnEvent"; + end; + +L_TooWeak: + mesn; + mesq l("The sea route I take is very dangerous, and full of pirates. You're too weak to travel with me."); + close; + +L_Close: + close; + +OnInit: + .sex = G_MALE; + .distance = 5; + end; + + +OnInterIfInit: + // Tulim Instance + .TULIM_INSTID = instance_create("016-1@TulimInst", 0, IOT_NONE); + instance_attachmap("016-1", .TULIM_INSTID, 0, "016-1@Tulim"); + instance_set_timeout(1000000, 1000000, .TULIM_INSTID); + instance_init(.TULIM_INSTID); + end; + + // Hurns Instance + .HURNS_INSTID = instance_create("016-1@HurnsInst", 0, IOT_NONE); + instance_attachmap("016-1", .HURNS_INSTID, 0, "016-1@Hurns"); + instance_set_timeout(1000000, 1000000, .HURNS_INSTID); + instance_init(.HURNS_INSTID); + end; + +} diff --git a/npc/016-1/marine.txt b/npc/016-1/marine.txt deleted file mode 100644 index 3772d88be..000000000 --- a/npc/016-1/marine.txt +++ /dev/null @@ -1,153 +0,0 @@ -// TMW2 scripts. -// Authors: -// Jesusalva -// Description: -// Temporary, placeholder. - -016-1,19,29,0 script Captain NPC_NARD,{ - if (BaseLevel < 20) - goto L_TooWeak; - - mesn; - mesq l("Hi @@.", strcharinfo(0)); - next; - mesq l("You are currently at @@.", LOCATION$); - mes ""; - - menu - rif(LOCATION$ != "Tulim", l("To Tulimshar.")), L_TTulim, - rif(LOCATION$ != "Hurns", l("To Hurnscald.")), L_THurns, - l("No, I'll save my money."), -; - - close; - -L_THurns: - .@price=2000; - .@x=marine_reputation("Hurns"); - - if (.@x >= 3) - .@price-=1500; - else if (.@x >= 2) - .@price-=1000; - else if (.@x >= 1) - .@price-=500; - - mes ""; - mesn; - mesq l("It'll cost you @@ GP.", .@price); - mes ""; - - if (Zeny < .@price) { - mes l("You still need @@ GP to afford it.", (.@price-Zeny)); - close; - } - - if (askyesno() != ASK_YES) - close; - - Zeny=Zeny-.@price; - PC_DEST$="Hurns"; - - mes ""; - mesn; - mesq l("Hurnscald? Small farming towns are always nice to visit."); - next; - mesq l("I was planning to go there soon, anyway. All aboard!"); - close2; - addtimer nard_time(PC_DEST$), "#MarineShip::OnEvent"; - @timer_navio_running = 1; - warp "016-6", 40, 32; - - // 10% base chance of Pirate Attack! - // Each level INCREASES this in 0.1%. - // So for a level 40 player, chances are 14%. - if (rand(1, 10000) < 1000+(BaseLevel*10)) - addtimer rand(3000,6000), "#MarineShipAttack::OnEvent"; - end; - - - - - - - - -L_TTulim: - .@price=2000; - .@x=marine_reputation("Tulim"); - - if (.@x >= 10) - .@price-=1500; - else if (.@x >= 8) - .@price-=1000; - else if (.@x >= 6) - .@price-=750; - else if (.@x >= 4) - .@price-=500; - else if (.@x >= 2) - .@price-=250; - - mes ""; - mesn; - mesq l("It'll cost you @@ GP.", .@price); - mes ""; - - if (Zeny < .@price) { - mes l("You still need @@ GP to afford it.", (.@price-Zeny)); - close; - } - - if (askyesno() != ASK_YES) - close; - - Zeny=Zeny-.@price; - PC_DEST$="Tulim"; - @timer_navio_running = 1; - - mes ""; - mesn; - mesq l("Tulimshar, right? The oldest human city-state!"); - next; - mesq l("I was planning to go there soon, anyway. All aboard!"); - close2; - addtimer nard_time(PC_DEST$), "#MarineShip::OnEvent"; - @timer_navio_running = 1; - warp "016-6", 40, 32; - - // 10% base chance of Pirate Attack! - // Each level INCREASES this in 0.1%. - // So for a level 40 player, chances are 14%. - if (rand(1, 10000) < 1000+(BaseLevel*10)) - addtimer rand(3000,6000), "#MarineShipAttack::OnEvent"; - end; - -L_TooWeak: - mesn; - mesq l("The sea route I take is very dangerous, and full of pirates. You're too weak to travel with me."); - close; - -L_Close: - close; - -OnInit: - .sex = G_MALE; - .distance = 5; - end; - - -OnInterIfInit: - // Tulim Instance - .TULIM_INSTID = instance_create("016-1@TulimInst", 0, IOT_NONE); - instance_attachmap("016-1", .TULIM_INSTID, 0, "016-1@Tulim"); - instance_set_timeout(1000000, 1000000, .TULIM_INSTID); - instance_init(.TULIM_INSTID); - end; - - // Hurns Instance - .HURNS_INSTID = instance_create("016-1@HurnsInst", 0, IOT_NONE); - instance_attachmap("016-1", .HURNS_INSTID, 0, "016-1@Hurns"); - instance_set_timeout(1000000, 1000000, .HURNS_INSTID); - instance_init(.HURNS_INSTID); - end; - -} diff --git a/npc/functions/util.txt b/npc/functions/util.txt index c7a9c3c90..9b2e106ac 100644 --- a/npc/functions/util.txt +++ b/npc/functions/util.txt @@ -124,7 +124,7 @@ function script marine_maxre { function script marine_reputation { .@nr=0; // Base reputation - // Tulimshar Quests (10 points) + // Tulimshar Quests (12 points) if (getarg(0) == "Tulim") { // Swezanne Quest (+1 rep) if (getq(TulimsharQuest_Swezanne) >= 1) @@ -168,17 +168,20 @@ function script marine_reputation { if (getq(TulimsharQuest_DarkInvocator) >= 7) .@nr=.@nr+1; - /* // Anwar Quest (+1 rep) - if (getq(TulimsharQuest_AnwarField) >= 99) + if (getq(TulimsharQuest_AnwarField) >= 10) .@nr=.@nr+1; - */ // Tycoon Quest (+1 rep) if (getq(MineQuest_Tycoon) >= 15) .@nr=.@nr+1; - // Hurnscald Quests (3 points) + // Neko Quest (+1 rep) + if (getq(TulimsharQuest_Neko) >= 2) + .@nr=.@nr+1; + + + // Hurnscald Quests (5 points) } else if (getarg(0) == "Hurns") { // Alan Quest (+1 rep) @@ -193,6 +196,14 @@ function script marine_reputation { if (getq(HurnscaldQuest_TeaParty) >= 2) .@nr=.@nr+1; + // Farmers Quest (+1 rep) + if (getq(HurnscaldQuest_Farmers) >= 5) + .@nr=.@nr+1; + + // Helena Quest (+1 rep) + if (getq(HurnscaldQuest_Bandits) >= 8) + .@nr=.@nr+1; + } //debugmes "Reputation: "+str(.@nr); -- cgit v1.2.3-60-g2f50