diff options
| -rw-r--r-- | npc/024-1/guard.txt | 3 | ||||
| -rw-r--r-- | npc/024-11/politics.txt | 16 | ||||
| -rw-r--r-- | npc/functions/util.txt | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/npc/024-1/guard.txt b/npc/024-1/guard.txt index 26abab9bc..070f5e3e4 100644 --- a/npc/024-1/guard.txt +++ b/npc/024-1/guard.txt @@ -14,8 +14,7 @@ L_MainLogic: if (BaseLevel < 40 && !REBIRTH) goto L_Unallowed; - if (Class == Elven) - { + if (frally()) { slide 93, 69; npctalk3 l("Elves are always allowed inside."); end; diff --git a/npc/024-11/politics.txt b/npc/024-11/politics.txt index d33c90c64..e4ca2c1e9 100644 --- a/npc/024-11/politics.txt +++ b/npc/024-11/politics.txt @@ -12,21 +12,27 @@ do { mesc ".:: "+l("Frostia Townhall")+" ::.", 2; mesc l("Current Town Administrator: ")+$FROSTIA_MAYOR$, 3; + + // FIXME: Some hack code to disable the town + // Frostia Townhall is only available if player activity reaches a threshold if (Class != Elven) mesc l("Only elves may run to Town Admin Office in Frostia!"), 1; else mesc l("Hey, you're an elf, cool! But you still cannot run for office here!"), 1; - if (!is_staff()) + if (!is_staff() || GETUSERSAVG() < 10) close; + POL_TownInfo("FROSTIA"); - mesc l("Application fee: @@ GP", .applytax); - if (is_staff()) - mesc l("Average user count = %d", GETUSERSAVG()); + // Frostia is special: Only citizens can apply for office + if (!frally()) + mesc l("Only elves may run to Town Admin Office in Frostia!"), 1; + else + mesc l("Application fee: @@ GP", .applytax); next; select l("Information"), rif(strcharinfo(0) == $FROSTIA_MAYOR$, l("Manage Town")), - rif(#POL_APPLYWEEK != gettimeparam(GETTIME_WEEKDAY) && GETUSERSAVG() >= 10, l("Apply for the office!")), + rif(#POL_APPLYWEEK != gettimeparam(GETTIME_WEEKDAY) && frally(), l("Apply for the office!")), l("View Candidate List and cast a vote"), l("[Quit]"); diff --git a/npc/functions/util.txt b/npc/functions/util.txt index 84782e448..afb94fbdf 100644 --- a/npc/functions/util.txt +++ b/npc/functions/util.txt @@ -1261,7 +1261,7 @@ function script NewcomerEXPDROPUP { // Frostia Util // frally( ) function script frally { - return (Class == Elven || reputation("Frostia") == 100); + return (Class == Elven || Class == Ukar || reputation("Frostia") == 100); } // Easter Egg |