From 62ef77683cd977feea5600cb690cd971655a202c Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 5 Feb 2020 08:20:13 -0300 Subject: New function: tutmes() Deprecate the crazy way we were doing before. Reason: I want to standardize a new color for tutorial speech. --- npc/003-1/inac.txt | 2 +- npc/003-1/itka.txt | 2 +- npc/003-1/sailors.txt | 2 +- npc/005-1/zegas.txt | 44 ++++++++++++++------------------------------ npc/005-4/rosen.txt | 2 +- npc/005-5/nylo.txt | 9 ++++----- npc/functions/main.txt | 18 ++++++++++++++++++ 7 files changed, 40 insertions(+), 39 deletions(-) diff --git a/npc/003-1/inac.txt b/npc/003-1/inac.txt index 9656ed4df..cd01ec96d 100644 --- a/npc/003-1/inac.txt +++ b/npc/003-1/inac.txt @@ -31,7 +31,7 @@ L_Quest: mesn; .@g$=lg("girl", "boy"); mesq l("Tulimshar is surrounded by strong monsters. If you go out with your poor equipment, you're going to be dead in no time, @@.", .@g$); - if (TUTORIAL) mesc l("Protip: You can use \"@monsterinfo \" to gauge a monster strength."); + tutmes l("You can use \"@monsterinfo \" to gauge a monster strength."), l("Protip"), false; next; mesn; mesq l("I probably can give you my Sharp Knife, though! If you want to help me, that is."); diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt index ff4d7fdbd..88e48ee94 100644 --- a/npc/003-1/itka.txt +++ b/npc/003-1/itka.txt @@ -10,7 +10,7 @@ mesq l("The inn north of me still haven't opened, which is a shame. I guess their cassino got too expensive."); next; mesq l("Anyway, I am selling Cherry Cakes to sponsor my studies. Please buy as many as you want!"); - if (TUTORIAL) mesc l("Protip: Ducks and Giant Maggots also drops Cherry Cakes."); + tutmes l("Ducks and Giant Maggots also drops Cherry Cakes."), l("Protip"), false; next; npcshopattach(.name$); openshop; diff --git a/npc/003-1/sailors.txt b/npc/003-1/sailors.txt index 34db37e2c..45b596608 100644 --- a/npc/003-1/sailors.txt +++ b/npc/003-1/sailors.txt @@ -55,7 +55,7 @@ L_Quest1: mesn; mesq l("There are secret caves on this city. In fact, Tulimshar holds many misteries."); mesc l("Take care: Secret passages can be dangerous places (or not)."); - if (TUTORIAL) mesc l("Protip: You can get Croconut from Crocotree, and fill @@ purchased in the market.", getitemlink(EmptyBox)); + tutmes l("You can get Croconut from Crocotree, and fill @@ purchased in the market.", getitemlink(EmptyBox)), l("Protip"), false; close; L_Report1: diff --git a/npc/005-1/zegas.txt b/npc/005-1/zegas.txt index d0b3d750c..a623f3238 100644 --- a/npc/005-1/zegas.txt +++ b/npc/005-1/zegas.txt @@ -5,7 +5,7 @@ // Saxso's widow. Asks new players to trigger a bug bomb in the storehouse. 005-1,43,85,0 script Zegas NPC_MONA,{ - .ItemCreate = CandorShorts; + function lagTutorial; .@q = getq(CandorQuest_Barrel); if (BaseLevel < 5) goto L_Weak; @@ -51,20 +51,7 @@ L_Start: mesn; mesq l("Thanks, come back and see me once you found the bug bomb and set it off."); setq CandorQuest_Barrel, 2; - if (TUTORIAL) { - next; - mesn; - mesc l("TUTORIAL: The bugs there can be pretty vicious. Do you know what's worse though? Lag."); - next; - mesn; - mesc l("TUTORIAL: By pressing @@, you can open the Shortcut menu. And by pressing @@, you open the skill menu!", b("F8"), b("F5")); - next; - mesn; - mesc l("TUTORIAL: If you drag the \"Resync\" skill from the skill list to the shortcut list, you'll be able to rapidly solve some lag issues!"); - next; - mesn; - mesc l("TUTORIAL: Of course, lag might always be a problem. Remember to drag healing items to the shortcut list too. %%2"); - } + lagTutorial(); close; L_Looking: @@ -72,20 +59,8 @@ L_Looking: mesq l("Still haven't found it? Well, keep looking the barrels at this storehouse. I know it's in there, somewhere."); if (TUTORIAL) { mesc l("Read the tutorial again?"); - if (askyesno() == ASK_YES) { - next; - mesn; - mesc l("TUTORIAL: The bugs there can be pretty vicious. Do you know what's worse though? Lag."); - next; - mesn; - mesc l("TUTORIAL: By pressing @@, you can open the Shortcut menu. And by pressing @@, you open the skill menu!", b("F8"), b("F5")); - next; - mesn; - mesc l("TUTORIAL: If you drag the \"Resync\" skill from the skill list to the shortcut list, you'll be able to rapidly solve some lag issues!"); - next; - mesn; - mesc l("TUTORIAL: Of course, lag might always be a problem. Remember to drag healing items to the shortcut list too. %%2"); - } + if (askyesno() == ASK_YES) + lagTutorial(); } close; @@ -94,7 +69,7 @@ L_QuestEnd: mesq l("From the smell I can see you found the bug bomb!"); mesq l("Thanks once again, I know it's not much but here is @@ GP for your troubles.", 350); getexp 63, 0; - getitem .ItemCreate, 1; + getitem CandorShorts, 1; Zeny = (Zeny + 350); setq CandorQuest_Barrel, 4; close; @@ -120,6 +95,15 @@ L_Close: goodbye; close; +function lagTutorial { + // TUTORIAL block + tutmes l("The bugs there can be pretty vicious. Do you know what's worse though? Lag."); + tutmes l("By pressing @@, you can open the Shortcut menu. And by pressing @@, you open the skill menu!", b("F8"), b("F5")); + tutmes l("If you drag the \"Resync\" skill from the skill list to the shortcut list, you'll be able to rapidly solve some lag issues!"); + tutmes l("Of course, lag might always be a problem. Remember to drag healing items to the shortcut list too. %%2"); + return; +} + OnInit: .sex = G_FEMALE; .distance = 4; diff --git a/npc/005-4/rosen.txt b/npc/005-4/rosen.txt index 3d48e2606..11d0166e5 100644 --- a/npc/005-4/rosen.txt +++ b/npc/005-4/rosen.txt @@ -73,7 +73,7 @@ L_Gloves: next; mesn; mesq l("Uhm, maybe I could teach you something, too. Go mine 5 @@. You should find some at northeast of the Island.", getmonsterlink(DiamondBif)); - if (TUTORIAL) mesc l("Bif is a monster shaped like weird rocks. Diamond Bif is a Bif with higher chances to drop Diamonds."); + tutmes l("Bif is a monster shaped like weird rocks. Diamond Bif is a Bif with higher chances to drop Diamonds."); next; mesn; mesq l("These monsters are a great source of raw crafting materials."); diff --git a/npc/005-5/nylo.txt b/npc/005-5/nylo.txt index c0ac3d98c..53804fff1 100644 --- a/npc/005-5/nylo.txt +++ b/npc/005-5/nylo.txt @@ -25,6 +25,7 @@ case 1: break; case 2: + // FIXME ME: Depends on: Living Quest mesn; mesq l("Sure. I like to keep Alcoholic beverages, because they raise EXP gain when you drink @@.", b(l("with friends"))); next; @@ -33,11 +34,9 @@ next; if (TUTORIAL && !@beertuto) { @beertuto=true; - mes l(".:: Alcohol Tutorial ::."); - mesc l("Drinking with friends will give 1.5% extra XP boost for each person nearby."); - mesc l("Alcohol effects expire upon death. You need vitality to drink more beer."); - mesc l("Even if you drink alone, you'll still receive the EXP bonus marked on the item description."); - next; + tutmes l("Drinking with friends will give 1.5% extra XP boost for each person nearby."), l(".:: Alcohol Tutorial ::."); + tutmes l("Alcohol effects expire upon death. You need vitality to drink more beer."), l(".:: Alcohol Tutorial ::."); + tutmes l("Even if you drink alone, you'll still receive the EXP bonus marked on the item description."), l(".:: Alcohol Tutorial ::."); } closeclientdialog; // Not needed? openshop "Nylo#Beer"; diff --git a/npc/functions/main.txt b/npc/functions/main.txt index 5df1999d2..808820aef 100644 --- a/npc/functions/main.txt +++ b/npc/functions/main.txt @@ -108,6 +108,24 @@ function script get_race { return l($@allraces$[.@g]); } +// tutmes (message, {header=Tutorial, headerfirst=True}) +function script tutmes { + .@header$=getarg(1, l("TUTORIAL")); + .@showheader=getarg(2, true); + .@tcol=9; // Tutorial color code + + if (TUTORIAL) { + dnext; + if (.@showheader) { + mesf(".:: %s ::.", .@header$); + mesc getarg(0), .@tcol; + } else { + mesc .@header$+": "+getarg(0), .@tcol; + } + } + return; +} + // Function to show narrator text. Accepts string args. // If first arg is a number N, then it represents bit flags. // Bit flags : -- cgit v1.2.3-60-g2f50