summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--world/map/npc/005-4/bossfight.txt4
-rw-r--r--world/map/npc/009-2/wyara.txt2
-rw-r--r--world/map/npc/014-1/wedding-officiator.txt4
-rw-r--r--world/map/npc/021-2/government_building.txt4
-rw-r--r--world/map/npc/029-3/parua.txt4
-rw-r--r--world/map/npc/031-4/cindyCave.txt7
-rw-r--r--world/map/npc/042-1/hasan.txt5
-rw-r--r--world/map/npc/functions/debug.txt6
-rw-r--r--world/map/npc/items/restricted_item.txt4
-rw-r--r--world/map/npc/items/unreleased_item.txt2
10 files changed, 21 insertions, 21 deletions
diff --git a/world/map/npc/005-4/bossfight.txt b/world/map/npc/005-4/bossfight.txt
index 506cdeae..34585360 100644
--- a/world/map/npc/005-4/bossfight.txt
+++ b/world/map/npc/005-4/bossfight.txt
@@ -125,14 +125,14 @@ L_Start_Level_3:
// Being ticks
onChaos:
- if (isdead(0)) end;
+ if (isdead()) end;
L_Set_Color:
message strcharinfo(0), "You feel funny. You think your color has changed.";
set @ELE_CAVE_COLOR, rand(1, 2);
end;
onTick:
- if (isdead(0)) end;
+ if (isdead()) end;
// Count this player as alive
set $@ELE_CAVE_PLAYER_COUNT, $@ELE_CAVE_PLAYER_COUNT + 1;
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index fdd7546c..25f88f82 100644
--- a/world/map/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
@@ -247,7 +247,7 @@ L_Magic_spell2:
if (getskilllv(SKILL_MAGIC) < 2)
mes "\"Hmm. You aren't powerful enough for this one either yet, I think.\"";
next;
- if (!(getpartnerid2(0)))
+ if (!(getpartnerid2()))
goto L_Magic_main;
mes "[Wyara the Witch]";
mes "\"Married partners can find each other even more easily. Use the '" + getspellinvocation("sense-spouse") + "' spell instead.\"";
diff --git a/world/map/npc/014-1/wedding-officiator.txt b/world/map/npc/014-1/wedding-officiator.txt
index f6bf7c9d..61810504 100644
--- a/world/map/npc/014-1/wedding-officiator.txt
+++ b/world/map/npc/014-1/wedding-officiator.txt
@@ -7,7 +7,7 @@
next;
L_main:
- if (getpartnerid2(0))
+ if (getpartnerid2())
goto L_main_married;
menu "What exactly do you do?", L_explain_self,
@@ -228,7 +228,7 @@ L_do_divorce:
goto L_divorce_nomoney;
- if divorce(0) goto L_DidDivorce;
+ if (divorce()) goto L_DidDivorce;
mes "[Wedding Officiator]";
mes "The officiator searches through her records for your partner.";
diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt
index f4f9d0de..52a20fbe 100644
--- a/world/map/npc/021-2/government_building.txt
+++ b/world/map/npc/021-2/government_building.txt
@@ -7,7 +7,7 @@
next;
L_main:
- if (getpartnerid2(0))
+ if (getpartnerid2())
goto L_main_married;
menu
@@ -97,7 +97,7 @@ L_do_divorce:
if (zeny < @divorce_cost)
goto L_not_enough_money;
- if divorce(0) goto L_divorce_done;
+ if (divorce()) goto L_divorce_done;
mes "[Estard]";
mes "\"I'm having trouble finding the record. \"";
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 5ed22174..03aa8a76 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -215,7 +215,7 @@ L_MOB6:
// Called on each player once every 5 seconds
onTick:
- if (isdead(0)) end;
+ if (isdead()) end;
set $@FIGHT_CAVE_PLAYER_COUNT, $@FIGHT_CAVE_PLAYER_COUNT + 1;
end;
@@ -248,7 +248,7 @@ L_CleanUp_Announcement:
end;
onReward:
- if (isdead(0)) end;
+ if (isdead()) end;
set BOSS_POINTS, BOSS_POINTS + 100;
message strcharinfo(0), "You gain 100 Boss Points giving you a total of " + BOSS_POINTS;
end;
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index f7974daa..c4a589b2 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -200,7 +200,7 @@ L_NextWave:
// Called on each player once every 5 seconds
onTick:
- if (isdead(0)) end;
+ if (isdead()) end;
set $@FIGHT_YETI_PLAYER_COUNT, $@FIGHT_YETI_PLAYER_COUNT + 1;
end;
@@ -223,15 +223,14 @@ L_CleanUp:
end;
onReward:
- if (isdead(0)) end;
+ if (isdead()) end;
set @bonus, (baselevel/2);
set DailyQuestBonus, DailyQuestBonus + @bonus;
message strcharinfo(0), "You feel a temporary rush of power and zest for action. " + @bonus + " daily bonus gained." ;
- if (@rescue_Cindy != 1 ) goto L_No_Progress;
+ if (@rescue_Cindy != 1 ) end;
set @rescue_Cindy, 2;
callsub S_Update_Mask;
message strcharinfo(0), "Cindy looks relieved and as if she wants to talk with you.";
-L_No_Progress:
end;
/////////
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 3e7184e4..8cdc690d 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -4,11 +4,12 @@
042-1.gat,111,68,0|script|Hasan|189,{
set @toll, 10000;
- set @x, getx(0);
- set @y, gety(0);
+ set @x, getx();
+ set @y, gety();
if (FLAGS & FLAG_TUTORIAL_DONE)
goto L_Tut_Done;
+ // Please consider rewriting this in terms of isin()
if ( (@y < 64)&&(@x < 110) || (@x < 107) )
goto L_Cliff_Up;
// implicitly, $@ScorpionFighter is nonzero
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index 016bb98c..fe72eb72 100644
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -21,10 +21,10 @@ L_Level:
input @lvl;
if (@lvl > 255) goto L_Leveltoohigh;
if (@lvl < 1) goto L_Leveltoolow;
- if (Baselevel - @lvl == 0) goto L_Samelvl;
- set BaseLevel, BaseLevel - (Baselevel - @lvl);
+ if (Baselevel == @lvl) goto L_Samelvl;
+ set BaseLevel, @lvl;
resetstatus;
- message "New level: " + Baselevel;
+ message strcharinfo(0), "New level: " + Baselevel;
goto L_Begin;
L_Samelvl:
diff --git a/world/map/npc/items/restricted_item.txt b/world/map/npc/items/restricted_item.txt
index 7d8e96ab..365c690f 100644
--- a/world/map/npc/items/restricted_item.txt
+++ b/world/map/npc/items/restricted_item.txt
@@ -8,10 +8,10 @@
function script RestrictedItem {
if (!@minLvl) set @minLvl, 60;
- if (debug || getgmlevel(0) >= @minLvl) return; // If the active character is staff, do nothing.
+ if (debug || getgmlevel() >= @minLvl) return; // If the active character is staff, do nothing.
message strcharinfo(0), "This item repells you with extreme force. It does not seem to be meant for you.";
unequipbyid @slotId;
- if (getgmlevel(0)) return;
+ if (getgmlevel()) return;
gmcommand "@wgm Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
gmcommand "@l Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
end;
diff --git a/world/map/npc/items/unreleased_item.txt b/world/map/npc/items/unreleased_item.txt
index 72d24b70..cac699f9 100644
--- a/world/map/npc/items/unreleased_item.txt
+++ b/world/map/npc/items/unreleased_item.txt
@@ -4,7 +4,7 @@
// ------------------------------------------------------------
function script UnreleasedItem {
- if (debug || getgmlevel(0)) end; // If the server allows equipping unreleased items or if the active character is staff, do nothing.
+ if (debug || getgmlevel()) end; // If the server allows equipping unreleased items or if the active character is staff, do nothing.
message strcharinfo(0), "You have difficulties equipping this item, as if it is not yet fully in this world.";
unequipbyid @slotId;
end;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 17:02:16 +0000