summaryrefslogtreecommitdiff
path: root/npc/pre-re/guides/guides_alberta.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
committershennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
commitbee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch)
tree79f9aec5171e8aed2d701bf67167f260e05f41db /npc/pre-re/guides/guides_alberta.txt
parent239d480487e24294975f35ed55f210837ad1088e (diff)
parentce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff)
downloadhercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et> Conflicts: src/map/battle.c
Diffstat (limited to 'npc/pre-re/guides/guides_alberta.txt')
-rw-r--r--npc/pre-re/guides/guides_alberta.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt
index f4a0d12ce..164aa528b 100644
--- a/npc/pre-re/guides/guides_alberta.txt
+++ b/npc/pre-re/guides/guides_alberta.txt
@@ -28,7 +28,7 @@ alberta,23,238,4 script Guide#alb::AlbGuide 8W_SOLDIER,{
mes "trouble finding anything in";
mes "town, or if you just need";
mes "guidance around the city.";
- set .@loop1,1;
+ .@loop1 = 1;
while (.@loop1) {
next;
switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
@@ -42,11 +42,11 @@ alberta,23,238,4 script Guide#alb::AlbGuide 8W_SOLDIER,{
mes "to mark locations";
mes "on your Mini-Map?";
next;
- if (select("Yes:No") == 1) set .@compass_check,1;
+ if (select("Yes:No") == 1) .@compass_check = 1;
}
- set .@loop2,1;
+ .@loop2 = 1;
while (.@loop2) {
- if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+ if (.@wait_button_chk == 0) .@wait_button_chk = 1;
else next;
switch(select("^FF0000Merchant Guild^000000:Weapon Shop:Tool Shop:Inn:Forge:Cancel")) {
@@ -104,7 +104,7 @@ alberta,23,238,4 script Guide#alb::AlbGuide 8W_SOLDIER,{
mes "no longer wish to have the";
mes "location marks displayed";
mes "on your Mini-Map.";
- set .@loop2,0;
+ .@loop2 = 0;
}
}
break;
@@ -114,7 +114,7 @@ alberta,23,238,4 script Guide#alb::AlbGuide 8W_SOLDIER,{
viewpoint 2,46,345,4,0xFF00FF;
viewpoint 2,175,220,5,0xFF00FF;
viewpoint 2,175,220,6,0xFF00FF;
- set .@compass_check,0;
+ .@compass_check = 0;
break;
case 3:
mes "[Alberta Guide]";
@@ -147,7 +147,7 @@ alberta,23,238,4 script Guide#alb::AlbGuide 8W_SOLDIER,{
mes "to ask me if you have any";
mes "questions about Alberta.";
close2;
- set .@loop1,0;
+ .@loop1 = 0;
}
}
cutin "prt_soldier",255;