summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/out/en.pot172
-rw-r--r--update/news.txt36
2 files changed, 100 insertions, 108 deletions
diff --git a/lang/out/en.pot b/lang/out/en.pot
index fb2076a..ef4dd11 100644
--- a/lang/out/en.pot
+++ b/lang/out/en.pot
@@ -277,43 +277,43 @@ msgid "/who mostra o nĂºmero de jogadores conectados no momento."
msgstr ""
#. code: l("1. ##BDo not bot##b, A character must be being controlled by a human, standing, siting, or logged off. You may only control one character at a time."),
-#: npc/functions/game-rules.txt:15
+#: npc/functions/game-rules.txt:16
#, no-c-format
msgid "1. ##BDo not bot##b, A character must be being controlled by a human, standing, siting, or logged off. You may only control one character at a time."
msgstr ""
#. code: l("2. ##BDo not spam nor flood.##b Texts entirely written in UPPER CASE helps counting as spam."),
-#: npc/functions/game-rules.txt:16
+#: npc/functions/game-rules.txt:17
#, no-c-format
msgid "2. ##BDo not spam nor flood.##b Texts entirely written in UPPER CASE helps counting as spam."
msgstr ""
#. code: l("3. ##BDo not trade invalid items, or try to cheat on trades.##b This includes any other kind of cheat or bug abuse, passive of account deletion and IP ban as stated by the Terms Of Service."),
-#: npc/functions/game-rules.txt:17
+#: npc/functions/game-rules.txt:18
#, no-c-format
msgid "3. ##BDo not trade invalid items, or try to cheat on trades.##b This includes any other kind of cheat or bug abuse, passive of account deletion and IP ban as stated by the Terms Of Service."
msgstr ""
#. code: l("4. ##BRespect other players.##b This includes but is not limited to using offensive language in nicknames or chat, and begging items or favours to other players."),
-#: npc/functions/game-rules.txt:18
+#: npc/functions/game-rules.txt:19
#, no-c-format
msgid "4. ##BRespect other players.##b This includes but is not limited to using offensive language in nicknames or chat, and begging items or favours to other players."
msgstr ""
#. code: l("5. ##BThe public chat is to be understood by everyone.##b Therefore, try to use english when possible."),
-#: npc/functions/game-rules.txt:19
+#: npc/functions/game-rules.txt:20
#, no-c-format
msgid "5. ##BThe public chat is to be understood by everyone.##b Therefore, try to use english when possible."
msgstr ""
#. code: l("6. ##BDo not create multi accounts.##b A person may only hold one account and as many chars as allowed by the server/client. Staff members with special privileges in-game may have a second account without those privileges."),
-#: npc/functions/game-rules.txt:20
+#: npc/functions/game-rules.txt:21
#, no-c-format
msgid "6. ##BDo not create multi accounts.##b A person may only hold one account and as many chars as allowed by the server/client. Staff members with special privileges in-game may have a second account without those privileges."
msgstr ""
#. code: l("7. ##BAs long as you have an account, you agree with the [@@https://tmw2.org/legal.php|Terms Of Service@@]##b. Shall any rule conflict with these terms, the Terms Of Service provided on that link shall prevail.");
-#: npc/functions/game-rules.txt:21
+#: npc/functions/game-rules.txt:22
#, no-c-format
msgid "7. ##BAs long as you have an account, you agree with the [@@https://tmw2.org/legal.php|Terms Of Service@@]##b. Shall any rule conflict with these terms, the Terms Of Service provided on that link shall prevail."
msgstr ""
@@ -355,7 +355,7 @@ msgid "@@ divorced!"
msgstr ""
#. code: announce l("@@ has the clear smile of victory!", strcharinfo(0)), bc_all;
-#: db/re/item_db.conf:2032
+#: db/re/item_db.conf:2033
#, no-c-format
msgid "@@ has the clear smile of victory!"
msgstr ""
@@ -786,7 +786,7 @@ msgid "All scorpions are dead!"
msgstr ""
#. code: l("All this seems unimportant to you right now.");
-#: npc/functions/game-rules.txt:38
+#: npc/functions/game-rules.txt:39
#, no-c-format
msgid "All this seems unimportant to you right now."
msgstr ""
@@ -1645,16 +1645,12 @@ msgstr ""
msgid "Black Pearl"
msgstr ""
-#. code: 007-1,120,43,10,7 monster Black Scoprion 1074,3,35000,300000
-#: npc/007-1/_mobs.txt:3
-#, no-c-format
-msgid "Black Scoprion"
-msgstr ""
-
+#. code: 007-1,120,43,10,7 monster Black Scorpion 1074,3,35000,300000
#. code: 003-1-2,34,36,15,3 monster Black Scorpion 1074,2,35000,150000
#. code: Name: "Black Scorpion"
#: mob_db.conf:3248
#: npc/003-1-2/_mobs.txt:2
+#: npc/007-1/_mobs.txt:3
#, no-c-format
msgid "Black Scorpion"
msgstr ""
@@ -1677,6 +1673,12 @@ msgstr ""
msgid "Blanket"
msgstr ""
+#. code: 003-1,39,101,8,11 monster Blob 1008,2,35000,150000
+#: npc/003-1/_mobs.txt:9
+#, no-c-format
+msgid "Blob"
+msgstr ""
+
#. code: Name: "Bloodstone Pendant"
#: item_db.conf:-1
#, no-c-format
@@ -2563,6 +2565,8 @@ msgstr ""
#. code: 001-4,74,77,23,23 monster Clover Field 1028,1,60000,120000
#. code: 001-4,224,238,23,23 monster Clover Field 1028,1,60000,120000
#. code: 001-4,72,232,23,23 monster Clover Field 1028,1,60000,120000
+#. code: 005-1,36,40,2,1 monster Clover Field 1028,1,35000,300000
+#: npc/005-1/_mobs.txt:2
#: npc/001-4/_mobs.txt:2
#: npc/001-4/_mobs.txt:4
#: npc/001-4/_mobs.txt:5
@@ -2577,12 +2581,6 @@ msgstr ""
msgid "Clover Patch"
msgstr ""
-#. code: 005-1,36,40,2,1 monster CloverPatch 1028,1,35000,300000
-#: npc/005-1/_mobs.txt:2
-#, no-c-format
-msgid "CloverPatch"
-msgstr ""
-
#. code: Name: "Coal"
#: item_db.conf:-1
#, no-c-format
@@ -2838,17 +2836,25 @@ msgstr ""
msgid "Crimson Cashmere Dye"
msgstr ""
-#. code: 000-1,32,116,8,9 monster Croc 1006,2,35000,300000
+#. code: 004-1,44,26,7,5 monster Croc 1006,3,35000,150000
#. code: 000-1,76,68,1,1 monster Croc 1006,1,35000,300000
+#. code: 003-1,81,103,2,3 monster Croc 1006,1,35000,150000
#. code: Name: "Croc"
+#. code: 003-1,64,58,4,1 monster Croc 1006,1,35000,150000
#. code: 000-1,52,92,4,17 monster Croc 1006,1,35000,300000
#. code: 000-1,63,31,10,3 monster Croc 1006,1,35000,300000
#. code: 000-1,71,77,4,4 monster Croc 1006,1,35000,300000
+#. code: 003-1,67,121,2,3 monster Croc 1006,1,35000,150000
+#. code: 000-1,32,116,8,9 monster Croc 1006,2,35000,300000
+#: npc/003-1/_mobs.txt:8
+#: npc/003-1/_mobs.txt:12
#: npc/029-1/_mobs.txt:26
#: npc/029-1/_mobs.txt:25
+#: npc/003-1/_mobs.txt:3
#: npc/029-1/_mobs.txt:24
#: npc/029-1/_mobs.txt:27
#: mob_db.conf:295
+#: npc/004-1/_mobs.txt:3
#: npc/029-1/_mobs.txt:23
#, no-c-format
msgid "Croc"
@@ -3333,7 +3339,7 @@ msgid "Do I look like a tree? I feel like one."
msgstr ""
#. code: l("Do not give the password of your room to anybody! Keep it secret and try not to use the same one in any other room in the future. - Juliet"),
-#: npc/002-3/note.txt:17
+#: npc/002-3/note.txt:33
#, no-c-format
msgid "Do not give the password of your room to anybody! Keep it secret and try not to use the same one in any other room in the future. - Juliet"
msgstr ""
@@ -3469,7 +3475,7 @@ msgid "Do you want to use this place as save point?"
msgstr ""
#. code: l("Does anyone know a good place to hang out in Esperia or Artis? - M. Arpan"),
-#: npc/002-3/note.txt:18
+#: npc/002-3/note.txt:34
#, no-c-format
msgid "Does anyone know a good place to hang out in Esperia or Artis? - M. Arpan"
msgstr ""
@@ -4034,7 +4040,7 @@ msgid "Fluo Powder"
msgstr ""
#. code: l("Following these lines are some other writings on this paper."),
-#: npc/002-3/note.txt:16
+#: npc/002-3/note.txt:32
#, no-c-format
msgid "Following these lines are some other writings on this paper."
msgstr ""
@@ -4224,8 +4230,10 @@ msgstr ""
#. code: Name: "Giant Maggot"
#. code: 009-1,66,36,28,10 monster Giant Maggot 1031,5,30000,90000
+#. code: 004-1,108,65,10,7 monster Giant Maggot 1031,4,35000,300000
#. code: 003-1,109,145,7,4 monster Giant Maggot 1031,1,30000,20000
#: npc/009-1/_mobs.txt:2
+#: npc/004-1/_mobs.txt:5
#: mob_db.conf:1305
#: npc/003-1/_mobs.txt:7
#, no-c-format
@@ -4238,12 +4246,6 @@ msgstr ""
msgid "Giant Mutated Bat"
msgstr ""
-#. code: 004-1,108,65,10,7 monster Giant maggot 1031,4,35000,300000
-#: npc/004-1/_mobs.txt:5
-#, no-c-format
-msgid "Giant maggot"
-msgstr ""
-
#. code: Name: "Ginger Bread Man"
#: item_db.conf:-1
#, no-c-format
@@ -4964,10 +4966,16 @@ msgstr ""
msgid "Hello do you want to play rock scissors paper?"
msgstr ""
-#. code: mesq l("Hello my friend! Need my help?");
+#. code: mesq lg("Hello my friend! Need my help?");
#: npc/005-7/trainer.txt:31
#, no-c-format
-msgid "Hello my friend! Need my help?"
+msgid "Hello my friend! Need my help?#0"
+msgstr ""
+
+#. code: mesq lg("Hello my friend! Need my help?");
+#: npc/005-7/trainer.txt:31
+#, no-c-format
+msgid "Hello my friend! Need my help?#1"
msgstr ""
#. code: mesq l("Hello there! I am a constable. I keep law and order here.");
@@ -6994,6 +7002,12 @@ msgstr ""
msgid "Leave it alone."
msgstr ""
+#. code: l("Leave.");
+#: npc/002-3/note.txt:17
+#, no-c-format
+msgid "Leave."
+msgstr ""
+
#. code: 003-5,38,41,0 script LeaveArena NPC_HIDDEN,0,0,{
#: npc/003-5/doors.txt:4
#, no-c-format
@@ -7159,17 +7173,19 @@ msgstr ""
#. code: 000-1,85,58,14,9 monster Little Blub 1007,2,35000,120000
#. code: 000-1,28,48,3,5 monster Little Blub 1007,1,35000,120000
#. code: 000-1,62,25,10,4 monster Little Blub 1007,2,25000,120000
+#. code: 003-1,25,73,8,25 monster Little Blub 1007,6,35000,150000
#. code: 000-1,48,61,9,6 monster Little Blub 1007,1,35000,120000
#. code: 000-1,44,75,2,1 monster Little Blub 1007,2,25000,120000
#. code: Name: "Little Blub"
#. code: 000-1,61,64,7,10 monster Little Blub 1007,2,25000,120000
#: npc/029-1/_mobs.txt:14
+#: npc/029-1/_mobs.txt:15
#: npc/029-1/_mobs.txt:13
-#: npc/029-1/_mobs.txt:10
+#: mob_db.conf:340
#: npc/029-1/_mobs.txt:9
-#: npc/029-1/_mobs.txt:15
+#: npc/029-1/_mobs.txt:10
#: npc/029-1/_mobs.txt:16
-#: mob_db.conf:340
+#: npc/003-1/_mobs.txt:10
#: npc/029-1/_mobs.txt:11
#, no-c-format
msgid "Little Blub"
@@ -7369,7 +7385,9 @@ msgstr ""
msgid "Malivox"
msgstr ""
+#. code: 005-1,71,39,28,10 monster Mana Bug 1075,5,35000,300000,Trainer::OnKillManaBug
#. code: Name: "Mana Bug"
+#: npc/005-1/_mobs.txt:8
#: mob_db.conf:3293
#, no-c-format
msgid "Mana Bug"
@@ -7395,12 +7413,6 @@ msgstr ""
msgid "Mana Stone"
msgstr ""
-#. code: 005-1,71,39,28,10 monster ManaBug 1075,5,35000,300000,Trainer::OnKillManaBug
-#: npc/005-1/_mobs.txt:8
-#, no-c-format
-msgid "ManaBug"
-msgstr ""
-
#. code: mesq l("Managed to drop anything? It requires more luck than skill. Here is your reward. (40 xp 25 gp)");
#: npc/005-7/trainer.txt:94
#, no-c-format
@@ -8209,8 +8221,8 @@ msgid "OK, I will get them."
msgstr ""
#. code: monster(.@map$, .@x, .@y, l("Oak"), 1017, 1);
+#: db/re/item_db.conf:11620
#: db/re/item_db.conf:152
-#: db/re/item_db.conf:11619
#, no-c-format
msgid "Oak"
msgstr ""
@@ -8643,7 +8655,7 @@ msgid "Other"
msgstr ""
#. code: l("Other things are written but are not legible anymore.");
-#: npc/002-3/note.txt:19
+#: npc/002-3/note.txt:35
#, no-c-format
msgid "Other things are written but are not legible anymore."
msgstr ""
@@ -9309,6 +9321,18 @@ msgstr ""
msgid "Raw Talisman"
msgstr ""
+#. code: l("Read the News."),
+#: npc/002-3/note.txt:16
+#, no-c-format
+msgid "Read the News."
+msgstr ""
+
+#. code: l("Read the Rules."),
+#: npc/002-3/note.txt:15
+#, no-c-format
+msgid "Read the Rules."
+msgstr ""
+
#. code: Name: "Red Apple"
#: item_db.conf:-1
#, no-c-format
@@ -9619,15 +9643,11 @@ msgid "Ruby"
msgstr ""
#. code: Name: "Ruby Bif"
+#. code: 007-1,99,99,99,99 monster Ruby Bif 1099,8,35000,300000
#: mob_db.conf:4385
-#, no-c-format
-msgid "Ruby Bif"
-msgstr ""
-
-#. code: 007-1,99,99,99,99 monster RubyBif 1099,8,35000,300000
#: npc/007-1/_mobs.txt:10
#, no-c-format
-msgid "RubyBif"
+msgid "Ruby Bif"
msgstr ""
#. code: Name: "RudolphSlime"
@@ -11106,6 +11126,12 @@ msgstr ""
msgid "The High Council's have some subordinates, but those are hand-picked by them."
msgstr ""
+#. code: l("The La Johanne always have interesting notes.");
+#: npc/002-3/note.txt:11
+#, no-c-format
+msgid "The La Johanne always have interesting notes."
+msgstr ""
+
#. code: mesq l("The Magic Council can be found at this city. They are the most powerful mages. If you have an impressive magical affinity, they may entitle you to have access to a Mana Stone.");
#: npc/003-1/gladys.txt:49
#, no-c-format
@@ -11193,7 +11219,7 @@ msgid "The fertile climate is ideal for mushrooms. You can also find lots of woo
msgstr ""
#. code: l("The first page contains the universal rules that have been agreed upon throughout the land.");
-#: npc/functions/game-rules.txt:32
+#: npc/functions/game-rules.txt:33
#, no-c-format
msgid "The first page contains the universal rules that have been agreed upon throughout the land."
msgstr ""
@@ -11264,7 +11290,7 @@ msgid "The name of the book is @@."
msgstr ""
#. code: l("The next page begins to list the complex trading laws and political rules."),
-#: npc/functions/game-rules.txt:37
+#: npc/functions/game-rules.txt:38
#, no-c-format
msgid "The next page begins to list the complex trading laws and political rules."
msgstr ""
@@ -11422,7 +11448,6 @@ msgstr ""
#. code: l("There is a paper with some rules written on it.");
#: npc/002-3/juliet.txt:198
#: npc/002-3/juliet.txt:79
-#: npc/002-3/note.txt:11
#, no-c-format
msgid "There is a paper with some rules written on it."
msgstr ""
@@ -11554,7 +11579,7 @@ msgid "This Portal can send your soul back to the world, along any items, money
msgstr ""
#. code: l("This book outlines the laws which applies everywhere in the World Of Mana."),
-#: npc/functions/game-rules.txt:31
+#: npc/functions/game-rules.txt:32
#, no-c-format
msgid "This book outlines the laws which applies everywhere in the World Of Mana."
msgstr ""
@@ -12036,6 +12061,8 @@ msgid "Topaz Bif"
msgstr ""
#. code: Name: "Toppy Blub"
+#. code: 003-1,37,70,3,13 monster Toppy Blub 1009,2,35000,150000
+#: npc/003-1/_mobs.txt:11
#: mob_db.conf:437
#, no-c-format
msgid "Toppy Blub"
@@ -14370,13 +14397,6 @@ msgstr ""
msgid "Zzzzzzzzz..."
msgstr ""
-#. code: mesq l("["+ strcharinfo(0) +"]");
-#: npc/005-7/trainer.txt:283
-#: npc/005-7/trainer.txt:42
-#, no-c-format
-msgid "["
-msgstr ""
-
#. code: mes l("[80 experience points]");
#: npc/004-1/elanore.txt:103
#, no-c-format
@@ -14423,24 +14443,6 @@ msgstr ""
msgid "a quiet place,"
msgstr ""
-#. code: 003-1,39,101,8,11 monster blob 1008,2,35000,150000
-#: npc/003-1/_mobs.txt:9
-#, no-c-format
-msgid "blob"
-msgstr ""
-
-#. code: 004-1,44,26,7,5 monster croc 1006,3,35000,150000
-#. code: 003-1,81,103,2,3 monster croc 1006,1,35000,150000
-#. code: 003-1,64,58,4,1 monster croc 1006,1,35000,150000
-#. code: 003-1,67,121,2,3 monster croc 1006,1,35000,150000
-#: npc/003-1/_mobs.txt:12
-#: npc/003-1/_mobs.txt:3
-#: npc/003-1/_mobs.txt:8
-#: npc/004-1/_mobs.txt:3
-#, no-c-format
-msgid "croc"
-msgstr ""
-
#. code: if (l("data @@ @@ @@ data", "this", "is", "test") != "data this is test data")
#. code: mes "Error: format string 'l(data @@ @@ @@ data, this, is, test)': " + l("data @@ @@ @@ data", "this", "is", "test");
#: npc/test/test1.txt:44
@@ -14521,12 +14523,6 @@ msgstr ""
msgid "line @@: @@"
msgstr ""
-#. code: 003-1,25,73,8,25 monster little blub 1007,6,35000,150000
-#: npc/003-1/_mobs.txt:10
-#, no-c-format
-msgid "little blub"
-msgstr ""
-
#. code: test,25,14,0 script marriage1 NPC_PLAYER,{
#: npc/test/npcmarriage.txt:6
#, no-c-format
@@ -14743,12 +14739,6 @@ msgstr ""
msgid "the npc choose scissors."
msgstr ""
-#. code: 003-1,37,70,3,13 monster toppy blub 1009,2,35000,150000
-#: npc/003-1/_mobs.txt:11
-#, no-c-format
-msgid "toppy blub"
-msgstr ""
-
#. code: mes l("Enabled: @@", (.@d ? l("no") : l("yes")));
#. code: mes l("Sent on login: @@", .@login ? l("yes") : l("no"));
#. code: mes l("Sent on login: @@", ($@SCHED_Opt[0] ? l("yes") : l("no")));
diff --git a/update/news.txt b/update/news.txt
index 6006fe1..2793576 100644
--- a/update/news.txt
+++ b/update/news.txt
@@ -1,31 +1,33 @@
-##0 Actual Release: ##1 02 - What Is Your Age?
+##0 Actual Release: ##1 2.1 - Free Lunch For Those Who Work Hard!
##0 Welcome to ##BTMW-2: Monster Wars##b!
##0 By playing you agree and abide to the ##1##BTerms of Service##b##0, available at:
##1 [@@https://tmw2.org/legal.php|https://tmw2.org/legal.php@@]
-##2 Last ToS update: 2018-02-24
+##2 Last ToS update: 2018-03-13
##1 Our Staff will never ask for your password. You are the sole responsible for
##1 its safety!
##2 If you ever run in trouble, try contacting a GM with ##B@request Help me!##b
##2 Please enjoy our server, and have fun!
-##7 Latest release: ##B2018-03-09##b
+##7 Latest release: ##B2018-03-16##b
##7 Never miss a release! Follow our [@@https://discord.gg/BQNTe68|Discord Channel@@]!
-##0 On this special release, the level caps went from (25/10) to (30/15).
-##0 Michel now haves a leaderboard so you know who is the richest and strongest
-##0 player of the server, various items were changed, and you can get more parts
-##0 from the Creased and the Candor set.
+##0 What time is best for an update, other than friday? In this release, you have
+##0 an extra job level. Various item prices were rebalanced to fix Zeny Exploits.
+##0 Extra quests were added to Candor and to the Ship, and both Elmo as Nard received
+##0 rewrites so game is easier to understand for newcomers.
-##0 At Tulimshar, Ishi and Aidan are once again there, to give you Monster Points,
-##0 but pocket ready - there is a register fee! After all, everyone knows that
-##0 There Is No Free Lunch, possible title for a next release!
+##0 The way how Nard calculates ship travels has changed, talk to Elmo while in
+##0 Candor and he'll inform your progress. ##BTranslations were updated##b, if you
+##0 are not happy with them, [@@https://transifex.com/akaras/saulc-tmw-fork|translate them@@]!
+##0 Note only server-data resource translations will be accepted.
-##0 This game is better played with friends, and some config was changed to reflect
-##0 that. Candor Nurse and Dan got new quests, and some monsters changed. Gift
-##0 Boxes were added, for the ##BGM Events##b which are announced by Discord/IRC!
+##1 Game rules were changed, you have been notified by that via email.
+##1 A total of 9 players have incorrect email address. If you did not received our
+##1 email, enter in contact to check if your email address is correct.
-##0 The equipment drops should also be working again.
+##0 You can use coins acquired at ##BGM Events##b (announced by Discord/IRC/broadcast)
+##0 with any Traveller or at Aeros.
##0 There is also a ##BDaily Login Bonus##b, to encourage you to keep playing!
##0 Please bear the development stages with us. There are balance problems, and
@@ -36,10 +38,10 @@
##7 We want to express our gratitude here to Saulc, for sponsoring this server.
##7 We also want to thanks to all testers: Thanks, you've did a great job!
##7 And by last, our gratitude to every developer and contributor who made this
-##7 possible! Ayruss, Polaczek, Acsvln, Jesusalva, Saulc, Crazyfefe, Rakinorf, etc.
+##7 possible! Jesusalva, Saulc, Crazyfefe, Soren, Ayruss, 4144, Micksha, et al.
-##0 Enjoy gaming, and leave feedback at Discord!
-##0 The third release is already being baked!
+##0 Enjoy gaming, and leave feedback!
+##0 As said, the third release is already being baked!
##9 -- Your TMW2 Team
##9 March 2018