summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/commands/super-menu.txt16
-rw-r--r--npc/functions/util.txt4
2 files changed, 16 insertions, 4 deletions
diff --git a/npc/commands/super-menu.txt b/npc/commands/super-menu.txt
index 40cf71141..08e7824e5 100644
--- a/npc/commands/super-menu.txt
+++ b/npc/commands/super-menu.txt
@@ -82,6 +82,9 @@ OnGM:
atcommand("#adjgroup demure 80");
} else if (strcharinfo(0) == "jak1") {
atcommand("#adjgroup jak1 80");
+ // Test Server grants
+ } else if (strcharinfo(0) == "Kolchak" && debug) {
+ atcommand("#adjgroup Kolchak 5");
//} else if (strcharinfo(0) == "Former_Cordo") {
// atcommand("#adjgroup 60 Former_Cordo");
} else {
@@ -89,14 +92,23 @@ OnGM:
.@auth=false;
}
// Handle authentication reports
- if (.@auth)
+ if (.@auth) {
announce strcharinfo(0)+" has just logged in services.", bc_all;
- else
+ logmes strcharinfo(0)+" : GM login.", LOGMES_ATCOMMAND;
+ } else {
logmes strcharinfo(0)+" : GM Authentication failed.", LOGMES_ATCOMMAND;
+ }
+ close;
+
+OnGMOff:
+ if (is_staff())
+ logmes strcharinfo(0)+" : GM logout.", LOGMES_ATCOMMAND;
+ atcommand("@adjgroup 0");
close;
OnInit:
bindatcmd "super", "@super::OnCall", 80, 99, 0;
+ bindatcmd "gmoff", "@super::OnGMOff", 5, 100, 1;
bindatcmd "gm", "@super::OnGM", 0, 100, 1;
// Special servers
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 95087455e..9c68d83af 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -763,7 +763,7 @@ function script learn_magic {
.@it=$@MSK_ITEM[.@ski];
.@am=$@MSK_AMOUNT[.@ski];
.@msp=$@MSK_MSPCOST[.@ski];
- .@ap=$@MSK_COST[.@ski];
+ .@ap=getskilllv(.@ski)*$@MSK_COST[.@ski];
// Pre-requisite check
if (.@pre) {
@@ -789,7 +789,7 @@ function script learn_magic {
mesc l("%s %s will require:", .@learn$, getskillname(.@ski));
mes l("* %d/%d MSP (Magic Skill Points)", sk_points(), .@msp);
- //mes l("* %d/%d AP (???)", MAGIC_AP, .@ap);
+ mes l("* %d/%d RP (Research Points)", MAGIC_RP, .@ap);
if (countitem(.@it) < .@am) {
mesc l("~~%d/%d %s~~", countitem(.@it), .@am, getitemlink(.@it)), 8;
mes l("* %d/%d %s", countitem(ScholarshipBadge), 1, getitemlink(ScholarshipBadge));