diff options
| -rw-r--r-- | npc/016-1/captain.txt | 4 | ||||
| -rw-r--r-- | npc/018-1/george.txt | 4 | ||||
| -rw-r--r-- | npc/functions/util.txt | 22 | ||||
| -rw-r--r-- | npc/items/teleporter.txt | 10 |
4 files changed, 31 insertions, 9 deletions
diff --git a/npc/016-1/captain.txt b/npc/016-1/captain.txt index 6850fd398..f05826428 100644 --- a/npc/016-1/captain.txt +++ b/npc/016-1/captain.txt @@ -23,7 +23,7 @@ close; L_THurns: - .@x=marine_reputation("Hurns"); + .@x=reputation("Hurns"); if (.@x >= 5) .@price-=1750; @@ -77,7 +77,7 @@ L_THurns: L_TTulim: - .@x=marine_reputation("Tulim"); + .@x=reputation("Tulim"); if (.@x >= 12) .@price-=1750; diff --git a/npc/018-1/george.txt b/npc/018-1/george.txt index 6223b2b93..004d6a3dd 100644 --- a/npc/018-1/george.txt +++ b/npc/018-1/george.txt @@ -46,8 +46,8 @@ L_Main: l("What is this island?"), L_Explain, rif(.@q == 1, l("Actually, I heard from Roger that you may need some help.")), L_RequestOne, rif(.@q == 2, l("About the items you asked me to collect...")), L_ProgressOne, - rif(.@q == 3, l("Do you need any more help?")), L_RequestTwo, - rif(.@q == 4, l("About the items you asked me to collect...")), L_ProgressTwo, + rif(.@q == 3 && 0, l("Do you need any more help?")), L_RequestTwo, + rif(.@q == 4 && 0, l("About the items you asked me to collect...")), L_ProgressTwo, l("Nothing I guess"), L_Close; // Context menu diff --git a/npc/functions/util.txt b/npc/functions/util.txt index 8f595cd9a..9228e8f25 100644 --- a/npc/functions/util.txt +++ b/npc/functions/util.txt @@ -92,7 +92,7 @@ function script marine_maxre { // Returns reputation with the La Marine for discounts // Takes one argument (PC_DEST$). Grep for "getarg". // Before updating this, update marine_maxre too! -function script marine_reputation { +function script reputation { .@nr=0; // Base reputation // Tulimshar Quests (12 points) @@ -152,6 +152,7 @@ function script marine_reputation { .@nr=.@nr+1; + // Hurnscald Quests (5 points) } else if (getarg(0) == "Hurns") { @@ -177,6 +178,25 @@ function script marine_reputation { } + + + // Land Of Fire Quests (3 points) + } else if (getarg(0) == "LoF") { + + // The EPISODE (+1 rep) + if (getq(LoFQuest_EPISODE) >= 2) + .@nr=.@nr+1; + + // George Quest (+1 rep) + if (getq(LoFQuest_George) >= 3) + .@nr=.@nr+1; + + // Fairy Quest (+1 rep) + if (getq(LoFQuest_Fairy) >= 3) + .@nr=.@nr+1; + + } + //debugmes "Reputation: "+str(.@nr); return .@nr; diff --git a/npc/items/teleporter.txt b/npc/items/teleporter.txt index d14f03413..27453b248 100644 --- a/npc/items/teleporter.txt +++ b/npc/items/teleporter.txt @@ -29,10 +29,12 @@ OnUse: mesc l("PS. Additional reagents may be required for warps."); next; + .@x=reputation("Hurns"); + menu l("Don't warp"), -, - l("Land Of Fire Village (30m)"), L_LoF, - l("Save Point (30m)"), L_Save; + l("Land Of Fire Village (@@m)", 50-.@x), L_LoF, + l("Save Point (@@m)", 30-.@x), L_Save; close; @@ -42,7 +44,7 @@ L_Save: } else { doevent "shake::OnGM"; warp "Save", 0, 0; - TELEPORTER_TIME=gettimetick(2)+(60*30); + TELEPORTER_TIME=gettimetick(2)+(60*30)-(.@x*60); } closedialog; end; @@ -53,7 +55,7 @@ L_LoF: } else { doevent "shake::OnGM"; warp "017-1", 120, 89; - TELEPORTER_TIME=gettimetick(2)+(60*30); + TELEPORTER_TIME=gettimetick(2)+(60*30)-(.@x*60); } closedialog; end; |