summaryrefslogtreecommitdiff
path: root/npc/pre-re/guides/guides_geffen.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_geffen.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_geffen.txt')
-rw-r--r--npc/pre-re/guides/guides_geffen.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/npc/pre-re/guides/guides_geffen.txt b/npc/pre-re/guides/guides_geffen.txt
index 46d7e9007..43e5c81c9 100644
--- a/npc/pre-re/guides/guides_geffen.txt
+++ b/npc/pre-re/guides/guides_geffen.txt
@@ -26,7 +26,7 @@ geffen,203,116,0 script Guide#gef::GefGuide 4_M_GEF_SOLDIER,{
mes "need any guidance around";
mes "the city, feel free to ask me";
mes "and I'll do my best to assist you. ^FFFFFFcobo^000000";
- set .@loop1,1;
+ .@loop1 = 1;
while (.@loop1) {
next;
switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) {
@@ -40,11 +40,11 @@ geffen,203,116,0 script Guide#gef::GefGuide 4_M_GEF_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;
// next;
switch(select("^FF0000Magic Acedemy^000000:Forge Shop:Weapon Shop:Tool Shop:Pub:Inn:Geffen Tower:Cancel")) {
@@ -116,7 +116,7 @@ geffen,203,116,0 script Guide#gef::GefGuide 4_M_GEF_SOLDIER,{
mes "no longer wish to have the";
mes "location marks displayed";
mes "on your Mini-Map.";
- set .@loop2,0;
+ .@loop2 = 0;
break;
}
}
@@ -129,7 +129,7 @@ geffen,203,116,0 script Guide#gef::GefGuide 4_M_GEF_SOLDIER,{
viewpoint 2,134,221,6,0xFF00FF;
viewpoint 2,204,214,7,0xFF00FF;
viewpoint 2,204,214,8,0x00FF00;
- set .@compass_check,0;
+ .@compass_check = 0;
break;
case 3:
mes "[Geffen Guide]";
@@ -162,7 +162,7 @@ geffen,203,116,0 script Guide#gef::GefGuide 4_M_GEF_SOLDIER,{
mes "your journeys through";
mes "the lands you may travel...";
close2;
- set .@loop1,0;
+ .@loop1 = 0;
}
}
cutin "gef_soldier",255;