diff options
-rw-r--r-- | npc/004-1/anwar.txt | 7 | ||||
-rw-r--r-- | npc/016-1/_import.txt | 2 | ||||
-rw-r--r-- | npc/016-1/captain.txt (renamed from npc/016-1/marine.txt) | 19 | ||||
-rw-r--r-- | npc/functions/util.txt | 21 |
4 files changed, 30 insertions, 19 deletions
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/marine.txt b/npc/016-1/captain.txt index 3772d88be..e31c9fa28 100644 --- a/npc/016-1/marine.txt +++ b/npc/016-1/captain.txt @@ -5,6 +5,7 @@ // Temporary, placeholder. 016-1,19,29,0 script Captain NPC_NARD,{ + .@price=2000; if (BaseLevel < 20) goto L_TooWeak; @@ -22,15 +23,18 @@ close; L_THurns: - .@price=2000; .@x=marine_reputation("Hurns"); - if (.@x >= 3) - .@price-=1500; + if (.@x >= 5) + .@price-=1750; + else if (.@x >= 4) + .@price-=1600; + else if (.@x >= 3) + .@price-=1200; else if (.@x >= 2) - .@price-=1000; + .@price-=800; else if (.@x >= 1) - .@price-=500; + .@price-=400; mes ""; mesn; @@ -73,10 +77,11 @@ L_THurns: L_TTulim: - .@price=2000; .@x=marine_reputation("Tulim"); - if (.@x >= 10) + if (.@x >= 12) + .@price-=1750; + else if (.@x >= 10) .@price-=1500; else if (.@x >= 8) .@price-=1000; 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); |