From 9f883e9770523d3ff2b2f79129cffb523419c6b6 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Fri, 5 Jul 2013 16:05:43 -0700 Subject: Make fourth word of functions non-empty, to appease the current server --- world/map/npc/functions/banker.txt | 2 +- world/map/npc/functions/barber.txt | 4 ++-- world/map/npc/functions/clear_vars.txt | 4 ++-- world/map/npc/functions/dailyquest.txt | 4 ++-- world/map/npc/functions/debug.txt | 2 +- world/map/npc/functions/evil_obelisk.txt | 2 +- world/map/npc/functions/ferry.txt | 2 +- world/map/npc/functions/game_rules.txt | 2 +- world/map/npc/functions/inn.txt | 2 +- world/map/npc/functions/lockpicking.txt | 2 +- world/map/npc/functions/magic.txt | 8 ++++---- world/map/npc/functions/mob_points.txt | 2 +- world/map/npc/functions/process_equip.txt | 2 +- world/map/npc/functions/slot_machine.txt | 2 +- world/map/npc/functions/soul_menhir.txt | 2 +- world/map/npc/functions/strangerquiz.txt | 2 +- world/map/npc/functions/time.txt | 2 +- world/map/npc/functions/water_bottle.txt | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) (limited to 'world/map/npc/functions') diff --git a/world/map/npc/functions/banker.txt b/world/map/npc/functions/banker.txt index 09cfdef6..8ecb85fb 100644 --- a/world/map/npc/functions/banker.txt +++ b/world/map/npc/functions/banker.txt @@ -1,6 +1,6 @@ // -function|script|Banker| +function|script|Banker|, { if (BankAccount == 0) goto L_Start; diff --git a/world/map/npc/functions/barber.txt b/world/map/npc/functions/barber.txt index 4ad5ee1f..dc7f0329 100644 --- a/world/map/npc/functions/barber.txt +++ b/world/map/npc/functions/barber.txt @@ -9,7 +9,7 @@ // or using GM commands, but scripts (such as this one) can set // any value 0-255 -function|script|Barber| +function|script|Barber|, { set @style, getlook(LOOK_HAIR_STYLE); set @color, getlook(LOOK_HAIR_COLOR); @@ -114,7 +114,7 @@ L_Done: // Since this is a function, not an NPC, OnInit doesn't work // So call this from a real NPC's OnInit (001-1/barber.txt) -function|script|OnInitBarber| +function|script|OnInitBarber|, { setarray $@HairStyles$, "Bald", "Flat ponytail", "Bowl cut", "Combed back", "Emo", "Mohawk", diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt index db94680f..1aa84d2b 100644 --- a/world/map/npc/functions/clear_vars.txt +++ b/world/map/npc/functions/clear_vars.txt @@ -1,6 +1,6 @@ // Clears old variables -function|script|ClearVariables| +function|script|ClearVariables|, { set EasterQuest, 0; @@ -185,7 +185,7 @@ L_Fix_Full: // The variable TMW_Quest was used to save the progress in several subquests linearly. // The subquests are moved to different nibbles of other variables // to make it possible to do some of the quests in parallel. -function|script|ClearVarTMW_Quest| +function|script|ClearVarTMW_Quest|, { if (TMW_Quest == 0) goto L_Done; if (TMW_Quest <= 6) goto L_Bernard_Mikhail; diff --git a/world/map/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt index 9bc84c5b..9b9d626e 100644 --- a/world/map/npc/functions/dailyquest.txt +++ b/world/map/npc/functions/dailyquest.txt @@ -27,7 +27,7 @@ // (DailyQuestBonus makes a good reward from non-daily quests) -function|script|DailyQuestPoints| +function|script|DailyQuestPoints|, { set @dq_earliest, gettimetick(2) - 86400; if (DailyQuestTime < @dq_earliest) @@ -55,7 +55,7 @@ L_Bonus: return; } -function|script|DailyQuest| +function|script|DailyQuest|, { callfunc "DailyQuestPoints"; diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt index 9f9559ea..5bf82356 100755 --- a/world/map/npc/functions/debug.txt +++ b/world/map/npc/functions/debug.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Jenalya, Ali-G -function|script|Debug| +function|script|Debug|, { L_Begin: set @debug_mask, 65535; diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt index e3e40f79..0875abb5 100644 --- a/world/map/npc/functions/evil_obelisk.txt +++ b/world/map/npc/functions/evil_obelisk.txt @@ -1,4 +1,4 @@ -function|script|EvilObelisk| +function|script|EvilObelisk|, { mes "[Evil Obelisk]"; mes "(A mystical aura surrounds this stone. It seems to crave money.)"; diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt index a28f0511..0b66f68e 100644 --- a/world/map/npc/functions/ferry.txt +++ b/world/map/npc/functions/ferry.txt @@ -1,6 +1,6 @@ // The ferry system -function|script|Ferry| +function|script|Ferry|, { if (BaseLevel < 20) goto L_LowerCost; diff --git a/world/map/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt index f735bf4a..caf13cb1 100644 --- a/world/map/npc/functions/game_rules.txt +++ b/world/map/npc/functions/game_rules.txt @@ -1,6 +1,6 @@ // -function|script|GameRules| +function|script|GameRules|, { set @read, 0; menu diff --git a/world/map/npc/functions/inn.txt b/world/map/npc/functions/inn.txt index aad9e6c1..271a4652 100644 --- a/world/map/npc/functions/inn.txt +++ b/world/map/npc/functions/inn.txt @@ -1,6 +1,6 @@ // INN -function|script|Inn| +function|script|Inn|, { mes "[" + @npcname$ + "]"; mes "\"Would you like to rest? It's only " + @cost + " gp.\""; diff --git a/world/map/npc/functions/lockpicking.txt b/world/map/npc/functions/lockpicking.txt index 638e3914..dc05fc53 100644 --- a/world/map/npc/functions/lockpicking.txt +++ b/world/map/npc/functions/lockpicking.txt @@ -4,7 +4,7 @@ // The player has to find the good number of times to hit a pin //----------------------------------------------------------------------------- -function|script|LockPicking| +function|script|LockPicking|, { set @lock_picking_success, 0; setarray @pins, rand(1,3), rand(1,3), rand(1,3); diff --git a/world/map/npc/functions/magic.txt b/world/map/npc/functions/magic.txt index 9fcb5226..a1faea94 100644 --- a/world/map/npc/functions/magic.txt +++ b/world/map/npc/functions/magic.txt @@ -10,7 +10,7 @@ // ------------------------------------------------------------ // Gain initial magic skill // ------------------------------------------------------------ -function|script|MagicGainBasic| +function|script|MagicGainBasic|, { set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_DRANK_POTION; close; @@ -20,7 +20,7 @@ function|script|MagicGainBasic| // ------------------------------------------------------------ // Initialise Menu for selecting a choice of things to ask about // ------------------------------------------------------------ -function|script|MagicTalkOptionsSetup| +function|script|MagicTalkOptionsSetup|, { set @QQ_ELANORE, 1; set @QQ_MANASEED, 2; @@ -41,7 +41,7 @@ function|script|MagicTalkOptionsSetup| // ------------------------------------------------------------ -function|script|MagicTalkMenu| +function|script|MagicTalkMenu|, { setarray @choice$, "", "", "", "", "", "", "", "", "", ""; set @choices_nr, 0; @@ -161,7 +161,7 @@ L_Q_post_astralsoul: // @SUP_name$ name of the skill to level up // @SUP_xp # of experience points to award if the level up succeeds // ------------------------------------------------------------ -function|script|SkillUp| +function|script|SkillUp|, { if (getskilllv(@SUP_id) >= @SUP_lvl) goto L_shortcut; diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt index aae10658..c5c7b7bd 100644 --- a/world/map/npc/functions/mob_points.txt +++ b/world/map/npc/functions/mob_points.txt @@ -1,6 +1,6 @@ // Mob points -function|script|MobPoints| +function|script|MobPoints|, { if (@mobID < 1002) return; diff --git a/world/map/npc/functions/process_equip.txt b/world/map/npc/functions/process_equip.txt index 4b8e1ccd..1e93320a 100644 --- a/world/map/npc/functions/process_equip.txt +++ b/world/map/npc/functions/process_equip.txt @@ -1,6 +1,6 @@ // -function|script|ProcessEquip| +function|script|ProcessEquip|, { set @head, getequipid(equip_head); set @torso, getequipid(equip_torso); diff --git a/world/map/npc/functions/slot_machine.txt b/world/map/npc/functions/slot_machine.txt index 4081adca..5d7e1ee6 100644 --- a/world/map/npc/functions/slot_machine.txt +++ b/world/map/npc/functions/slot_machine.txt @@ -1,6 +1,6 @@ // -function|script|SlotMachine| +function|script|SlotMachine|, { mes "Pull the lever..."; next; diff --git a/world/map/npc/functions/soul_menhir.txt b/world/map/npc/functions/soul_menhir.txt index 315c89d4..02907210 100644 --- a/world/map/npc/functions/soul_menhir.txt +++ b/world/map/npc/functions/soul_menhir.txt @@ -1,4 +1,4 @@ -function|script|SoulMenhir| +function|script|SoulMenhir|, { mes "[Soul Menhir]"; mes "(A mystical aura surrounds this stone. You feel mysteriously attracted to it. Something tells you to touch it. What do you do?)"; diff --git a/world/map/npc/functions/strangerquiz.txt b/world/map/npc/functions/strangerquiz.txt index 6290dbab..211e7e4b 100644 --- a/world/map/npc/functions/strangerquiz.txt +++ b/world/map/npc/functions/strangerquiz.txt @@ -1,5 +1,5 @@ -function|script|StrangerQuiz| +function|script|StrangerQuiz|, { // param @quizparam$$ // return in @quizanswer$ diff --git a/world/map/npc/functions/time.txt b/world/map/npc/functions/time.txt index a8236cb4..5f728639 100644 --- a/world/map/npc/functions/time.txt +++ b/world/map/npc/functions/time.txt @@ -6,7 +6,7 @@ // output @ts_date$ "yyyy-mm-dd" // output @ts_time$ "hh:mm:ss" -function|script|time_stamp| +function|script|time_stamp|, { // local variables // if there is reasonable demand, these might be exported diff --git a/world/map/npc/functions/water_bottle.txt b/world/map/npc/functions/water_bottle.txt index e65009da..f24f2bc5 100644 --- a/world/map/npc/functions/water_bottle.txt +++ b/world/map/npc/functions/water_bottle.txt @@ -1,6 +1,6 @@ // Fills empty bottles with water -function|script|WaterBottle| +function|script|WaterBottle|, { set @COST_PER_BOTTLE, 150; -- cgit v1.2.3-60-g2f50