Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Global_Function updates.

Browse Source 
* Added the following functions:
  - "F_GetPlural" (returns plural of noun) / "F_InsertPlural" (returns plural if arg != 1)  [credits: EnglishClub for formation rules]
  - "F_InsertArticle" (returns 'a' or 'an' preceding word)
  - "F_InsertComma" (formats number with commas)
  - "F_GetNumSuffix" (formats number with '-st', '-nd', '-rd', or '-th' suffix)
* Added and removed new functions where necessary. (incomplete)
* Added new types to "F_GetArmorType" function, and weapons will now pass to "F_GetWeaponType".
* Reformatted comments.

Other changes:
* Removed some garbage text from scripts.
* Slight edits to custom warper script.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
This commit is contained in:
Euphy
2014-01-03 20:13:44 -05:00
parent 2d35b03bf7
commit 97687ca10c
52 changed files with 628 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
npc/cities/comodo.txt
View File

@@ -132,7 +132,7 @@ cmd_in02,172,105,4 script G . J#cmd 86,{
mes "it seems smarter to make";
mes "money in other ways. Sure,";
mes "working hard is no fun, but";
mes "there are ways to use your^FFFFFF ^000000 money to make more of it, right?";
mes "there are ways to use your money to make more of it, right?";
next;
mes "[G . J]";
mes "There's also the matter of";
@@ -217,7 +217,7 @@ cmd_in02,57,62,4 script Moo#cmd 109,{
mes "manager of the Comodo";
mes "Casino. We pride ourselves in";
mes "serving all of our customers'";
mes "needs, doing all we can so that^FFFFFF ^000000 your visit here is unforgettable.";
mes "needs, doing all we can so that your visit here is unforgettable.";
next;
mes "[Moo]";
mes "All of our guests can enjoy";
@@ -251,7 +251,7 @@ cmd_fild04,188,74,4 script Zyosegirl#cmd 93,{
mes "It's nice to be able to work";
mes "outdoors, but someday, I want";
mes "to save enough money and move";
mes "to the city. I'm still young, you^FFFFFF ^000000 know, and I've got dreams";
mes "to the city. I'm still young, you know, and I've got dreams";
mes "that I want to fulfill~";
close;
}
@@ -408,7 +408,7 @@ moc_fild12,35,303,4 script Serutero#cmd 59,{
mes "guardian of the roads that";
mes "lead to Sandaruman Fortress.";
mes "If you really want to go there,";
mes "I'll permit you to continue, but^FFFFFF ^000000 you must beware of its dangers...";
mes "I'll permit you to continue, but you must beware of its dangers...";
next;
switch(select("I'm going there!:Sandaruman Fortress?:Cancel")) {
case 1:

26
npc/cities/lighthalzen.txt
View File

@@ -333,7 +333,7 @@ lighthalzen,230,182,4 script Klaubis#zen3 866,{
mes "many people stay in their";
mes "hometowns. Even if you do";
mes "leave, though, you can always";
mes "come back. It wouldn't be your^FFFFFF ^000000 hometown if you couldn't, right?";
mes "come back. It wouldn't be your hometown if you couldn't, right?";
close;
case 2:
mes "[Klaubis]";
@@ -461,7 +461,7 @@ lighthalzen,132,103,5 script Sefith#li_01 734,{
mes "Good looks. Intelligence.";
mes "Excellent manners. A strong,";
mes "manly chin and overpowering,";
mes "piercing eyes. Perfectly balanced^FFFFFF ^000000 passion and charimsma. All the";
mes "piercing eyes. Perfectly balanced passion and charimsma. All the";
mes "good things that ladies want.";
next;
mes "[Sefith]";
@@ -1084,8 +1084,8 @@ OnTouch:
mes "[Beggar]";
mes "What you can see and";
mes "understand might not match";
mes "with reality. Like the stars that^FFFFFF ^000000 are always there, but not visible";
mes "during the day, we'll always have^FFFFFF ^000000 hope, even if we can't see it.";
mes "with reality. Like the stars that are always there, but not visible";
mes "during the day, we'll always have hope, even if we can't see it.";
next;
mes "[" + strcharinfo(0) + "]";
emotion e_dots,1;
@@ -1113,7 +1113,7 @@ OnTouch:
mes "sort of don't. Let me explain";
mes "it this way. I take life day by";
mes "day, with each day covering its";
mes "own spectrum with miracle on^FFFFFF ^000000 one end and tragedy on the other.";
mes "own spectrum with miracle on one end and tragedy on the other.";
next;
mes "[Beggar]";
mes "So each day has the capacity";
@@ -1133,7 +1133,7 @@ OnTouch:
next;
mes "[Beggar]";
mes "Stand up when you're down";
mes "and live your life with passion.^FFFFFF ^000000 The capacity for miracles will";
mes "and live your life with passion. The capacity for miracles will";
mes "always be there and know that";
mes "you can be someone else's";
mes "miracle. Isn't that wonderful?";
@@ -1174,14 +1174,14 @@ OnTouch:
mes "isn't so productive. More of";
mes "a frustration that you can let";
mes "go. Someone cut you off on the";
mes "freeway or a friend innocently^FFFFFF ^000000 forgot your birthday? No biggie.";
mes "freeway or a friend innocently forgot your birthday? No biggie.";
next;
mes "[Beggar]";
mes "Don't let this kind of";
mes "anger get to you or you'll";
mes "look like a loser. Think of";
mes "the big picture and if you're";
mes "still upset, vent appropriately.^FFFFFF ^000000 Be honest without hurting anyone.";
mes "still upset, vent appropriately. Be honest without hurting anyone.";
next;
mes "[Beggar]";
mes "The second kind of anger";
@@ -1204,7 +1204,7 @@ OnTouch:
mes "righteous anger, say to protect";
mes "someone dear to you, will make";
mes "you a hero. Fighting with anger";
mes "born of frustration will make you^FFFFFF ^000000 a bully. Know the difference.";
mes "born of frustration will make you a bully. Know the difference.";
next;
mes "[" + strcharinfo(0) + "]";
emotion e_dots,1;
@@ -1383,7 +1383,7 @@ lhz_in01,139,40,7 script Enoz#oz 53,{
mes "[Enoz]";
mes "So, the novel I ordered from";
mes "the Rune-Midgarts Kingdom";
mes "just recently arrived. It's real^FFFFFF ^000000 good, by the guy who wrote";
mes "just recently arrived. It's real good, by the guy who wrote";
mes "''Roda Frog Adventure''";
mes "years ago. Remember?";
next;
@@ -2592,7 +2592,7 @@ lighthalzen,107,107,3 script Kosit#zen1 869,{
mes "these rules is because of all";
mes "the unruly gangsters that can";
mes "sometimes get into the city.";
mes "I mean, it's relatively peaceful^FFFFFF ^000000 and all. But these rules...";
mes "I mean, it's relatively peaceful and all. But these rules...";
next;
mes "[Kosit]";
mes "It's good to be safe,";
@@ -2669,7 +2669,7 @@ lighthalzen,364,282,3 script Bodger#zen5 870,{
mes "I hear that the people";
mes "who live Uptown eat totally";
mes "delicious, gourmet food eight";
mes "times a day! Hopefully it's just^FFFFFF ^000000 an exaggeration. 'Cuz if it";
mes "times a day! Hopefully it's just an exaggeration. 'Cuz if it";
mes "wasn't, I'd be so mad...";
close;
}
@@ -2986,7 +2986,7 @@ lhz_in01,139,48,7 script Leimi#mimir 73,{
mes "[Leimi]";
mes "Oh, you're an Assassin!";
mes "Oh, you boys are soooo cute!";
mes "And so cool and so mysterious^FFFFFF ^000000 all at the same time! I love you!";
mes "And so cool and so mysterious all at the same time! I love you!";
}
else {
next;