diff --git a/src/Main.cc b/src/Main.cc index 44da6c22..df0f7f23 100644 --- a/src/Main.cc +++ b/src/Main.cc @@ -96,7 +96,7 @@ Version get_cli_version(Arguments& args, Version default_value = Version::UNKNOW return Version::BB_PATCH; } else if (args.get("dc-nte")) { return Version::DC_NTE; - } else if (args.get("dc-proto")) { + } else if (args.get("dc-proto") || args.get("dc-11-2000")) { return Version::DC_V1_11_2000_PROTOTYPE; } else if (args.get("dc-v1")) { return Version::DC_V1; @@ -1282,9 +1282,13 @@ Action a_decode_word_select_set( WordSelectSet ws(read_input_data(args), version, &unitxt_collection, args.get("japanese")); ws.print(stdout); }); - -Action a_generate_word_select_table( - "generate-word-select-table", nullptr, +[](Arguments& args) { +Action a_print_word_select_table( + "print-word-select-table", "\ + print-word-select-table\n\ + Print the Word Select token translation table. If a version option is\n\ + given, prints the table sorted by token ID for that version. If no version\n\ + option is given, prints the token table sorted by canonical name.\n", + +[](Arguments& args) { auto table = ServerState::load_word_select_table_from_system(); Version v = Version::UNKNOWN; try { diff --git a/system/word-select/name-alias-lists.json b/system/word-select/name-alias-lists.json index 714b58d1..e076ee78 100644 --- a/system/word-select/name-alias-lists.json +++ b/system/word-select/name-alias-lists.json @@ -1,40 +1,68 @@ [ - ["CADUCEUS", "CADUSEUS"], + [",", "\u00E3\u0080\u0081"], + ["!", "\u00EF\u00BC\u0081"], + ["?", "\u00EF\u00BC\u009F"], + [".", "\u00E3\u0080\u0082"], + ["affected by \"SHOCK\"", "taking effect of \"SHOCK\"", "taking effect of \"SHORT\""], + ["alone", "solitude"], + ["Android,\nlay down a trap for me.", "Android, \nlay down a trap for me."], + ["are you going to meet", "are you meeting with"], + ["are you headed for", "are you headed"], + ["Are you ready to\ngo on an adventure?", "Are you ready to\ngo adventure?", "Are you ready to go adventure?"], + ["are you venturing", "are you traveling"], ["AREA:MINE", "AREA:MACHINE MINE"], ["AREA:RUINS", "AREA:ANCIENT"], + ["ARLAN", "ALRAN"], ["ARMS", "arms"], - ["EVADE MATERIAL", "AVOID MATERIAL"], - ["Android,\nlay down a trap for me.", "Android, \nlay down a trap for me."], - ["Are you ready to\ngo on an adventure?", "Are you ready to\ngo adventure?", "Are you ready to go adventure?"], - ["CHAINSAWD", "CHAINSWORD"], - ["CHRISTMAS PRESENT", "CHIRISTMAS PRESENT"], - ["PIONEER 2", "CITY"], - ["CUSTOM BARRIER ver.00", "CUSTOM BARRIER ver.OO"], - ["CUSTOM RAY ver.00", "CUSTOM RAY", "CUSTOM RAY ver.OO"], + ["art appreciation", "art"], + ["bad fortune", "bad luck"], + ["body boarding", "body boad"], + ["bonsai trees", "dwarf tree"], + ["CADUCEUS", "CADUSEUS"], + ["camping", "camp"], + ["can equip with", "can equip"], ["Can I join in?\nI'm a beginner.", "Can I join in? I'm a beginner."], ["Can you come again\nwhen you have\nmore experience?", "Can you come again when you have more experience?"], ["Can you come over\nto see me?", "Can you come over to see me?"], ["Can you play some\nmore?", "Can you play some more?"], ["Can you wait for me\nfor just a little while\nlonger?", "Can you wait for me for just a little while longer?"], + ["can't equip with", "can't equip"], + ["canoeing", "canoe"], + ["CHAINSAWD", "CHAINSWORD"], + ["CHRISTMAS PRESENT", "CHIRISTMAS PRESENT"], + ["collecting things", "collection"], + ["commanding the PC", "using computers"], + ["CUSTOM BARRIER ver.00", "CUSTOM BARRIER ver.OO"], + ["CUSTOM RAY ver.00", "CUSTOM RAY", "CUSTOM RAY ver.OO"], ["DAL RA LIE", "DAL LA LIE"], ["DARK BELRA", "DARTH BELRA"], - ["DULGER", "DURGA"], ["Did we come to this\nplace before?", "Did we come to this place before?"], ["Did you restore\nyour HP?", "Did you restore your HP?"], - ["Do you want\nanything from me?", "Do you want anything\nfrom me?", "Do you want anything from me?"], // TODO CHECK ["Do you want to chat\nwith me?", "Do you want to chat with me?"], + ["Do you want\nanything from me?", "Do you want anything\nfrom me?", "Do you want anything from me?"], + ["don't stay", "don't stay in"], + ["DRAW", "SUCK"], + ["driving a car", "drive a car"], ["Drop a Mag for me!", "Drop a Mag!"], ["Drop a weapon for me!", "Drop a weapon!"], ["Drop some armor for me!", "Drop some armor!"], - ["Forget about them.\nLet's move.", "Forget about them. Let's move."], // TODO CHECK + ["DULGER", "DURGA"], + ["equiped with", "equipped"], + ["EVADE MATERIAL", "AVOID MATERIAL"], + ["film appreciation", "animated film"], + ["FIXED:INTRODUCTION", "FIXED:SHORT MAIL"], + ["Forget about them.\nLet's move.", "Forget about them. Let's move."], ["Give me some armor.", "Give me some armors."], ["Give me your GUILD CARD.", "Give me your Guild Card."], ["Go into the\nTELEPORTER.", "Go into the\nTRANSPORTER.", "Go into the TRANSPORTER."], + ["go move on toward", "go move on towards"], + ["going to the movies", "appreciateing movie"], ["Good to see you.\nGot time to talk?", "Good to see you. Got time to talk?"], ["H&S25 JUSTICE", "HS25 JUSTICE"], ["Hang on a second.\nI'll be there.", "Hang on a second. I'll be there."], ["Hello!? Are you\nwith me?", "Hello!? Are you with me?"], ["Help me out! I can't\nrun away!", "Help me out! I can't run away!"], + ["Help me!\nI don't want to die!", "I don't want to die!"], ["Help, I have almost\nno HP!", "Help, I have almost no HP!"], ["Here's a MONOFLUID.", "Here's a MONOFLUIO."], ["Here's a MONOMATE.", "Here's a MONOMAIT."], @@ -68,18 +96,21 @@ ["I'll lead the enemies\nover here. Somebody\nback me up.", "I'll lead the enemies\nover here. Somebody\nsupport me.", "I'll lead the enemies over here. Somebody support me."], ["I'll take care of\nthis!", "I'll take care of this!"], ["I'll turn on the\nswitch.", "I'll turn on the switch."], - ["I'm coming to\nsee you.", "I'm coiming to see you."], - ["I'm coming to save\nyou. Hold on.", "I'm coming to save you. Hold on."], ["I'm coming to save you,\nbut it will take time.", "I'm coming to save you, but it will take time."], + ["I'm coming to save\nyou. Hold on.", "I'm coming to save you. Hold on."], + ["I'm coming to\nsee you.", "I'm coiming to see you."], ["I'm going ahead of\nyou.", "I'm going ahead of you."], ["I'm going in.\nBack me up, OK?", "I'm going in. Back me up, OK?"], ["I'm going to be\nkilled.", "I'm going to be killed."], ["I'm not ready.\nHold on.", "I'm not ready. Hold on."], + ["is exiting the game", "is quiting the game"], + ["is leading", "is heading"], + ["is returning", "returning"], ["Is this the right\ndirection?", "Is this the right direction?"], - ["It's OK! We can do\nit!", "It's OK! We can do it!"], ["It's a waste of time.\nCome later.", "It's a waste of time. Come later."], - ["JUSTY-23ST", "JUSTY'23ST"], + ["It's OK! We can do\nit!", "It's OK! We can do it!"], ["Just joking.", "Jusy joking."], + ["JUSTY-23ST", "JUSTY'23ST"], ["L&K14 COMBAT", "LK14 COMBAT"], ["Let me take care\nof them.", "Let me take care of them."], ["Let's exchange\nGUILD CARDS.", "Let's exchange\nGUILD-CARDs", "Let's exchange COM-CARDs"], @@ -88,29 +119,43 @@ ["Let's move to the\nnext area.", "Let's move to the next area."], ["Let's split up into\ntwo groups.", "Let's split up into two groups."], ["Let's trade\nsomething.", "Let's trade something."], + ["listening to music", "appreciateing music"], ["Long time no see.", "Long time no see you."], + ["looked older", "looking older"], ["M&A60 VISE", "MA60 VISE"], ["MADHU", "MADU"], + ["making art", "art"], + ["making art", "pictorial art"], ["MASTER/ABILITY", "MASTER/ABILYTY"], ["MELQUEEK", "MELQEEK"], ["MERLAN", "MELRAN"], + ["Mexico", "United Mexican States"], + ["mountain biking", "riding a mountain bike"], + ["must stay", "must stay in"], ["Nice playing with\nyou.", "Nice playing with you."], ["No problem. I know\nthe route.", "No problem. I know the route."], ["No way! I'll help\nyou!", "No way! I'll help you!"], ["No, I want to play\nsome more!", "No, I want to play some more!"], ["No, I'll go there.\nWhere are you?", "No, I'll go there. Where are you?"], ["No, I've played this\ngame for some time.", "No, I've played this game for some time."], - ["OK!", "OK"], ["OK, I'll catch up\nwith you later.", "OK, I'll catch up with you later."], ["OK, I'll wait\nfor you here.", "OK, I'll wait for you here."], ["OK, let me create\nit.", "OK, let me create it."], ["OK, what do you\nwant?", "OK, what do you want?"], ["OK, where shall\nwe go?", "OK, where shall we go?"], ["OK, where shall\nwe meet?", "OK, where shall we meet?"], + ["OK!", "OK"], ["OK.\nBut wait a minute.", "OK. I'll be right\nback."], ["Okay,\nI'm going to throw the switch.\nEverybody get ready to run like mad!", "Okay,I'm going to throw the switch.\nEverybody get ready to run like mad!"], ["P-ARM'S ARMS", "P-ARM's ARMs"], - ["PSYCHO", "PSYCHO WAND"], + ["PIONEER 2", "CITY"], + ["playing American football", "playing american football"], + ["playing basketball", "pleying basketball"], + ["playing darts", "playing dart"], + ["playing ice hockey", "playing Ice hockey"], + ["playing online games", "ON-LINE GAME"], + ["playing piano", "playing a piano"], + ["playing video games", "playing a video game"], ["Please cast ANTI\non me!", "Please cast ANTI on me!"], ["Please cast RESTA\non me!", "Please cast RESTA on me!"], ["Please clear the\ntrap.", "Please clear the trap."], @@ -119,19 +164,23 @@ ["Please take care\nof them!", "Please take care of them!"], ["Please use\nWORD SELECT.", "Please use WORD SELECT."], ["Please wait for\nme there.", "Please wait for me there."], - ["RUDRA", "RUDORA"], + ["powered down with \"DEF DOWN\"", "powered up with \"DE DOWN\""], + ["powered up with \"DEF UP\"", "powered up with \"DE UP\""], + ["PSYCHO", "PSYCHO WAND"], + ["puzzles", "puzzle"], + ["reading comics", "reading a cartoon"], ["Really?", "Really\u00EF\u00BC\u009F"], + ["rollerblading", "roller blade"], + ["RUDRA", "RUDORA"], + ["running marathons", "marathon"], ["Russia", "Rossiya"], - ["SHIELD", "Shield"], - ["STANDSTILL SHIELD", "STANDDTILL SHIELD"], - ["DRAW", "SUCK"], ["Select Form.", "Select form."], ["Select Subject.", "Select subject."], ["Select Target.", "Select target."], ["Select Topic.", "Select topic."], ["Shall we go and get\na QUEST first?", "Shall we go and get\na QUEST?", "Shall we go and get a QUEST?"], - ["Shall we go back\nto PIONEER 2?", "Shall we go back\nto the Morgue?", "Shall we go back\nto PIONEER 2", "Shall we go back\nto the CITY?", "Shall we go back to the CITY?"], ["Shall we go back ?", "Shall we go back?"], + ["Shall we go back\nto PIONEER 2?", "Shall we go back\nto the Morgue?", "Shall we go back\nto PIONEER 2", "Shall we go back\nto the CITY?", "Shall we go back to the CITY?"], ["Shall we go to the\nCHECK ROOM first?", "Shall we go to the CHECK ROOM first?"], ["Shall we go to the\nMEDICAL ROOM first?", "Shall we go to the MEDICAL ROOM first?"], ["Shall we go to the\nPRINCIPAL'S ROOM first?", "Shall we go to\nthe PRINCIPAL'S ROOM first?", "Shall we go to the PRINCIPAL'S ROOM first?"], @@ -139,6 +188,8 @@ ["Shall we go to the\nTEKKER first?", "Shall we go to the TEKKER first?"], ["Shall we go to\nthe VISUAL LOBBY first?", "Shall we go to the\nVISUAL LOBBY first?", "Shall we go to the VISUAL LOBBY first?"], ["Shall we retreat\nnow?", "Shall we retreat now?"], + ["SHIELD", "Shield"], + ["snowboarding", "snow board"], ["Somebody go and\nhelp.", "Somebody go and help."], ["Somebody please\nrestore my HP!", "Somebody please restore my HP!"], ["Somebody please\nrestore my TP!", "Somebody please restore my TP!"], @@ -154,13 +205,16 @@ ["Sorry, I wasn't paying\nattention.", "Sorry, I wasn't paying attention."], ["Sorry, I'm waiting\nfor my friends.", "Sorry,\nI'm waiting\nfor my friends.", "Sorry, I'm waiting for my friends."], ["Sorry,I can't help\nyou.", "Sorry,I can't help you."], + ["sports", "sport"], + ["STANDSTILL SHIELD", "STANDDTILL SHIELD"], + ["stay", "stay in"], ["Sure thing!", "Sure,"], ["Sure, go ahead.", "Sure, go ahead"], ["Sure, let me handle\nthis!", "Sure, let me handle this!"], - ["TOPIC: MAG", "TOPIC: BARRIER/MAG Card (FORCE)"], - ["TOPIC: TECHNIQUE", "TOPIC: TECHINIQUE", "TOPIC: Technique Card"], + ["taking photographs", "takeing a photograph"], ["Thanks for your\nhelp.", "Thanks for your help."], ["The enemies here\nare too strong.\nLet's leave.", "The enemies here are too strong. Let's leave."], + ["the next room", "the next loom"], ["There are some\nmore enemies left.", "There are some more enemies left."], ["There are still enemies\nto defeat.", "There are still enemies to defeat."], ["There are still items\nto get.", "There are still items to get."], @@ -168,14 +222,19 @@ ["This door won't\nopen.", "This door won't open."], ["This is the first time\nI've played the game.", "This is the first time I've played the game."], ["This way.\nFollow me.", "This way. Follow\nme.", "This way. Follow me."], + ["TOPIC: MAG", "TOPIC: BARRIER/MAG Card (FORCE)"], + ["TOPIC: TECHNIQUE", "TOPIC: TECHINIQUE", "TOPIC: Technique Card"], + ["travelling", "travel"], ["U.S.A.", "U.S.A"], - ["Mexico", "United Mexican States"], ["VISK-235W", "VISK'235W"], ["VOL OPT ver.2", "VOL OPT Ver2"], ["WALS-MK2", "WALS'MK2"], ["Want me to lend you a MAG?", "Want me to lend you a Mag?"], + ["was taken", "did you lose"], ["Watch out for the\nenemies!", "Watch out for the enemies!"], ["Watch out.\nThere's a trap here.", "Watch out. There's a trap here."], + ["watching cartoons", "taking a movie"], + ["watching TV", "watching the television"], ["We can't move unless\nwe kill all of them.", "We can't move unless we kill all of them."], ["We don't need to.\nLet's go.", "We don't need to. Let's go."], ["What is our TEAM\nname?", "What is our TEAM name?"], @@ -185,72 +244,25 @@ ["What's wrong with\nyou?", "What's wrong with you?"], ["When can we meet\nagain?", "When can we meet again?"], ["Which AREA do you\nwant to go to?", "Which AREA do you want to go to?"], - ["Which QUEST do you\nwant to play?", "Which QUEST do you want to play?", "Which TEAM\nwill you join?"], - ["Which TEAM will\nyou join?", "Which TEAM will you\njoin in?", "Which TEAM will you join in?", "Which country\ndo you live in?"], ["Which country do\nyou live in?", "Which country do you live in?", "Which direction shall\nwe go?", "Which direction shall we go?"], ["Which lobby are\nyou in now?", "Which lobby are you in now?"], + ["Which QUEST do you\nwant to play?", "Which QUEST do you want to play?", "Which TEAM\nwill you join?"], + ["Which TEAM will\nyou join?", "Which TEAM will you\njoin in?", "Which TEAM will you join in?", "Which country\ndo you live in?"], ["Who is creating a TEAM?", "Who creating a TEAM?"], ["Why don't we take\na break?", "Why don't we\ntake a break?", "Why don't we take\na rest?", "Why don't we take a rest?"], - ["Will you go with\nme?", "Will you go with me?"], - ["Will you still be\nstaying here?", "Will you still stay\nhere?", "Will you still stay here?"], - ["YASMINKOV 2000H", "YASMINKOV 2000"], - ["YASMINKOV 3000R", "YASMINKOV 3000"], - ["YELLOWBOZE", "YELLOWBOOZE"], - ["You create a TEAM,\nplease.", "You create a TEAM, please."], - ["You create a Team,\nplease.", "You create a Team, please."], - ["are you going to meet", "are you meeting with"], - ["are you headed for", "are you headed"], - ["are you venturing", "are you traveling"], - ["art appreciation", "art"], - ["bad fortune", "bad luck"], - ["body boarding", "body boad"], - ["camping", "camp"], - ["can equip with", "can equip"], - ["can't equip with", "can't equip"], - ["canoeing", "canoe"], - ["collecting things", "collection"], - ["commanding the PC", "using computers"], - ["don't stay", "don't stay in"], - ["driving a car", "drive a car"], - ["bonsai trees", "dwarf tree"], - ["equiped with", "equipped"], - ["film appreciation", "animated film"], - ["go move on toward", "go move on towards"], - ["going to the movies", "appreciateing movie"], - ["is exiting the game", "is quiting the game"], - ["is leading", "is heading"], - ["is returning", "returning"], - ["listening to music", "appreciateing music"], - ["looked older", "looking older"], - ["making art", "art"], - ["running marathons", "marathon"], - ["mountain biking", "riding a mountain bike"], - ["must stay", "must stay in"], - ["playing American football", "playing american football"], - ["playing ice hockey", "playing Ice hockey"], - ["playing piano", "playing a piano"], - ["playing video games", "playing a video game"], - ["playing basketball", "pleying basketball"], - ["playing darts", "playing dart"], - ["powered down with \"DEF DOWN\"", "powered up with \"DE DOWN\""], - ["powered up with \"DEF UP\"", "powered up with \"DE UP\""], - ["playing online games", "ON-LINE GAME"], - ["puzzles", "puzzle"], - ["reading comics", "reading a cartoon"], - ["rollerblading", "roller blade"], - ["snowboarding", "snow board"], - ["sports", "sport"], - ["stay", "stay in"], - ["taking photographs", "takeing a photograph"], - ["taking effect of \"SHOCK\"", "taking effect of \"SHORT\""], - ["the next room", "the next loom"], - ["travelling", "travel"], - ["was taken", "did you lose"], - ["watching TV", "watching the television"], + ["will attack", "make attack on"], ["will equip with", "will equip"], ["will gather", "will gather at"], ["will move on toward", "will move on towards"], + ["Will you be\nstaying here?", "Will you still be\nstaying here?"], ["will you bet on", "will you bet"], ["will you exit", "will you quit"], + ["Will you go with\nme?", "Will you go with me?"], + ["Will you still be\nstaying here?", "Will you still stay\nhere?", "Will you still stay here?"], ["will you take with you", "will you take with"], + ["YASMINKOV 2000H", "YASMINKOV 2000"], + ["YASMINKOV 3000R", "YASMINKOV 3000"], + ["YELLOWBOZE", "YELLOWBOOZE"], + ["You create a Team,\nplease.", "You create a Team, please."], + ["You create a TEAM,\nplease.", "You create a TEAM, please."] ]