summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-05-26 22:42:22 -0300
committerJesusaves <cpntb1@ymail.com>2021-05-26 22:42:22 -0300
commitc6373b1077e24555292c3f503a25564c313e0fb2 (patch)
tree289c73676fdcbd2aaef189c99a8f2bb4291572e6 /npc
parent648010015f48cd397908cebe991cc562796668c1 (diff)
downloadserverdata-c6373b1077e24555292c3f503a25564c313e0fb2.tar.gz
serverdata-c6373b1077e24555292c3f503a25564c313e0fb2.tar.bz2
serverdata-c6373b1077e24555292c3f503a25564c313e0fb2.tar.xz
serverdata-c6373b1077e24555292c3f503a25564c313e0fb2.zip
Fix some typos
Diffstat (limited to 'npc')
-rw-r--r--npc/functions/bitwise.txt36
-rw-r--r--npc/functions/hub.txt8
2 files changed, 26 insertions, 18 deletions
diff --git a/npc/functions/bitwise.txt b/npc/functions/bitwise.txt
index fd80024ef..7d0047e89 100644
--- a/npc/functions/bitwise.txt
+++ b/npc/functions/bitwise.txt
@@ -73,17 +73,17 @@ function script get_nibble {
case 0:
.@s=0; .@m=0xF; break;
case 1:
- .@s=4; .@m=0XF0; break;
+ .@s=4; .@m=0xF0; break;
case 2:
- .@s=8; .@m=0XF00; break;
+ .@s=8; .@m=0xF00; break;
case 3:
- .@s=12; .@m=0XF000; break;
+ .@s=12; .@m=0xF000; break;
case 4:
- .@s=16; .@m=0XF0000; break;
+ .@s=16; .@m=0xF0000; break;
case 5:
- .@s=20; .@m=0XF00000; break;
+ .@s=20; .@m=0xF00000; break;
case 6:
- .@s=24; .@m=0XF000000; break;
+ .@s=24; .@m=0xF000000; break;
default:
Exception("Invalid Nibble: "+getarg(1), RB_DEFAULT, .@v);
}
@@ -99,11 +99,11 @@ function script get_byte {
case 0:
.@s=0; .@m=0xFF; break;
case 1:
- .@s=8; .@m=0XFF00; break;
+ .@s=8; .@m=0xFF00; break;
case 2:
- .@s=16; .@m=0XFF0000; break;
+ .@s=16; .@m=0xFF0000; break;
case 3:
- .@s=24; .@m=0X7F000000; break;
+ .@s=24; .@m=0x7F000000; break;
default:
Exception("Invalid Byte: "+getarg(1), RB_DEFAULT, .@v);
}
@@ -128,17 +128,17 @@ function script set_nibble {
case 0:
.@s=0; .@m=0xF; break;
case 1:
- .@s=4; .@m=0XF0; break;
+ .@s=4; .@m=0xF0; break;
case 2:
- .@s=8; .@m=0XF00; break;
+ .@s=8; .@m=0xF00; break;
case 3:
- .@s=12; .@m=0XF000; break;
+ .@s=12; .@m=0xF000; break;
case 4:
- .@s=16; .@m=0XF0000; break;
+ .@s=16; .@m=0xF0000; break;
case 5:
- .@s=20; .@m=0XF00000; break;
+ .@s=20; .@m=0xF00000; break;
case 6:
- .@s=24; .@m=0XF000000; break;
+ .@s=24; .@m=0xF000000; break;
default:
Exception("Invalid SNibble: "+getarg(2), RB_DEFAULT);
}
@@ -154,11 +154,11 @@ function script set_byte {
case 0:
.@s=0; .@m=0xFF; break;
case 1:
- .@s=8; .@m=0XFF00; break;
+ .@s=8; .@m=0xFF00; break;
case 2:
- .@s=16; .@m=0XFF0000; break;
+ .@s=16; .@m=0xFF0000; break;
case 3:
- .@s=24; .@m=0X7F000000; break;
+ .@s=24; .@m=0x7F000000; break;
default:
Exception("Invalid SByte: "+getarg(2), RB_DEFAULT);
}
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 691961fe0..9e6e492e0 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -26,6 +26,12 @@ function script HUB_Login {
if (getvaultid() && !getstatus(SC_JAILED)) {
.@gto=get_byte(##00_INFO, 3);
.@mlp=get_nibble(##00_INFO, 5);
+ /*debugmes "INFO: %d", ##00_INFO;
+ debugmes "BYTE: %d/%d/%d/%d", get_byte(##00_INFO, 0), get_byte(##00_INFO, 1), get_byte(##00_INFO, 2), get_byte(##00_INFO, 3);
+ debugmes "NIBBLE: %d/%d/%d/%d/%d/%d/%d/%d", get_nibble(##00_INFO, 0), get_nibble(##00_INFO, 1), get_nibble(##00_INFO, 2), get_nibble(##00_INFO, 3), get_nibble(##00_INFO, 4), get_nibble(##00_INFO, 5), get_nibble(##00_INFO, 6), get_nibble(##00_INFO, 7);
+ debugmes "Your Vault ID: %d", getvaultid();
+ debugmes "VAULT LOGIN, GTO is %d MLP is %d", .@gto, .@mlp;
+ */
// Work only on new chars, or chars which cleared Tulimshar.
if (.@gto == $WID &&
(!getq(General_Narrator) ||
@@ -59,6 +65,8 @@ function script HUB_Login {
// Heading somewhere which is not here!
mesc l("WARNING: If you use any Mirror Lake feature on this world, the current Mirror Lake Quest will be marked as \"Failed\"."), 1;
mesc l("If this is undesired, select the correct world, and if needed create a new char on it."), 1;
+ ##VAULT_GOTO=.@gto;
+ ##VAULT_MLTO=.@mlp;
next;
closeclientdialog;
}