summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-24 01:19:53 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-24 01:19:53 +0300
commit83c1dd8e707cb76c60c45dc29451decd8c9c44cc (patch)
tree02e1c1d88ccf48c34c31d42a1c50c53fc6df5766
parent6ae158cb3685dc535f4aada8054a40cccc175378 (diff)
downloadserverdata-83c1dd8e707cb76c60c45dc29451decd8c9c44cc.tar.gz
serverdata-83c1dd8e707cb76c60c45dc29451decd8c9c44cc.tar.bz2
serverdata-83c1dd8e707cb76c60c45dc29451decd8c9c44cc.tar.xz
serverdata-83c1dd8e707cb76c60c45dc29451decd8c9c44cc.zip
In test map add way to show hide map layers.
-rw-r--r--npc/test/_import.txt1
-rw-r--r--npc/test/mapflags.txt1
-rw-r--r--npc/test/npc1.txt30
3 files changed, 27 insertions, 5 deletions
diff --git a/npc/test/_import.txt b/npc/test/_import.txt
index 98d531fc..17a3a5cc 100644
--- a/npc/test/_import.txt
+++ b/npc/test/_import.txt
@@ -1,4 +1,5 @@
// Map test
+npc: npc/test/mapflags.txt
npc: npc/test/_warps.txt
npc: npc/test/npc1.txt
npc: npc/test/npc2.txt
diff --git a/npc/test/mapflags.txt b/npc/test/mapflags.txt
new file mode 100644
index 00000000..144d8bdc
--- /dev/null
+++ b/npc/test/mapflags.txt
@@ -0,0 +1 @@
+test mapflag mask 5
diff --git a/npc/test/npc1.txt b/npc/test/npc1.txt
index 9eb851a3..7c53e87d 100644
--- a/npc/test/npc1.txt
+++ b/npc/test/npc1.txt
@@ -26,15 +26,35 @@ test,10,10,0 script npc1 800,3,3,{
return;
}
- switch (select("show area:change sex:change npc direction:quest test:add cart:remove cart"))
+ switch (select("show area:map:change sex:change npc direction:quest test:add cart:remove cart"))
{
case 1:
areatest;
break;
case 2:
- changecharsex;
+ .@mask = getmapmask("test");
+ mes "current mask: " + str(.@mask);
+ switch (select("show sand:show grass:show fog:hide fog"))
+ {
+ case 1:
+ setmapmask "test", (.@mask | (4 + 8)) ^ 8;
+ break;
+ case 2:
+ setmapmask "test", (.@mask | (4 + 8)) ^ 4;
+ break;
+ case 3:
+ setmapmask "test", .@mask | 2;
+ break;
+ case 4:
+ setmapmask "test", (.@mask | 2) ^ 2;
+ break;
+ }
break;
+
case 3:
+ changecharsex;
+ break;
+ case 4:
for (.@f = 0; .@f < 9; .@f ++)
{
mes "" + .@f;
@@ -42,7 +62,7 @@ test,10,10,0 script npc1 800,3,3,{
next;
}
break;
- case 4:
+ case 5:
mes "current";
.@val0 = getq(ShipQuests_Gugli);
mes "val=" + .@val0;
@@ -54,10 +74,10 @@ test,10,10,0 script npc1 800,3,3,{
mes "val=" + .@val;
setq ShipQuests_Gugli, .@val0;
next;
- case 5:
+ case 6:
setcart 1;
break;
- case 6:
+ case 7:
setcart 0;
break;
}