From dea723cd59fd08eae2ed235d3b9f0571ba0ff214 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 15 Jul 2021 01:29:19 -0300 Subject: Styling, Translations, and Cindy's conversion rule + Magic EXP conversion. Magic conversion will happen on this block if @HoraK give me what I need. Otherwise, it will also be wiped on this block. --- db/pre-re/mob_db.conf | 8 ++-- npc/099-5/boss.txt | 95 ++++++++++++++++++++++---------------------- npc/functions/clear_vars.txt | 16 ++++++++ 3 files changed, 67 insertions(+), 52 deletions(-) diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf index 43419fbe..55ed858e 100644 --- a/db/pre-re/mob_db.conf +++ b/db/pre-re/mob_db.conf @@ -3601,13 +3601,13 @@ mob_db: ( AttackMotion: 672 DamageMotion: 50 Drops: { - MageRing: 4 - BlackRose: 30 TreasureKey: 800 UndeadEar: 150 UndeadEye: 150 RottenRags: 70 Soul: 50 + BlackRose: 30 + MageRing: 4 BlinkingHocus: 1 } }, @@ -3650,13 +3650,13 @@ mob_db: ( AttackMotion: 672 DamageMotion: 50 Drops: { - EnchantersAmulet: 2 - BlackRose: 30 TreasureKey: 800 UndeadEar: 90 UndeadEye: 80 RottenRags: 70 Soul: 50 + BlackRose: 30 + EnchantersAmulet: 2 } }, { diff --git a/npc/099-5/boss.txt b/npc/099-5/boss.txt index eed13059..01ea29f7 100644 --- a/npc/099-5/boss.txt +++ b/npc/099-5/boss.txt @@ -148,7 +148,7 @@ OnMTChallenge: @dd5_timer = gettimetick(0); getexp 40000, 0; BOSS_POINTS = BOSS_POINTS + 5; - message strcharinfo(0), "This battle experience distribution is different, and death is final. Be careful!"; + message strcharinfo(0), l("This battle experience distribution is different, and death is final. Be careful!"); // Give everyone some participation points simply for continued survival @dd5_score = 1200; $@DD5_PTS = $@DD5_PTS+1200; @@ -614,71 +614,71 @@ OnEpilogue1: addtimer 10, "#TMWFinalExam::OnIllegalExit1"; mes "[Zax De'Kagen]"; - mes "Thanks for the "+$@DD5_TSPENT$+" of fun you gave me!"; + mes l("Thanks for the %s of fun you gave me!", $@DD5_TSPENT$); next; if (debug) goto L_Epilogue1Part22; mes "[Zax De'Kagen]"; - mes "This was not in the plan, but was fun nonetheless. Worth the detour."; + mes l("This was not in the plan, but was fun nonetheless. Worth the detour."); next; mes "[Zax De'Kagen]"; - mes "However, now I need to go. Unlike you, I do not want to be late."; + mes l("However, now I need to go. Unlike you, I do not want to be late."); next; menu - "We just killed you?", L_Epilogue1Part1, - "Late? What do you mean?", L_Epilogue1Part1; + l("We just killed you?"), L_Epilogue1Part1, + l("Late? What do you mean?"), L_Epilogue1Part1; L_Epilogue1Part1: mes "[Zax De'Kagen]"; - mes "You know villains never lie. Did you notice how I did not attack any of you directly?"; + mes l("You know villains never lie. Did you notice how I did not attack any of you directly?"); next; mes "[Zax De'Kagen]"; - mes "I already finished my plans "+$@DD5_TSPENT2$+" ago, otherwise I would not be bothering myself with you."; + mes l("I already finished my plans %s ago, otherwise I would not be bothering myself with you.", $@DD5_TSPENT2$); next; mes "[Zax De'Kagen]"; - mes "I hope you did not hoped to kill me. Wait. You actually did?!"; + mes l("I hope you did not expected to kill me. Wait. You actually did?!"); next; mes "[Zax De'Kagen]"; - mes "HAHAHAHAHAHAHAHA!!"; + mes l("HAHAHAHAHAHAHAHA!!"); next; mes "[Zax De'Kagen]"; - mes "Thanks for this, I don't recall laughing so hard the past five years."; + mes l("Thanks for this, I don't recall laughing so hard the past five years."); next; mes "[Zax De'Kagen]"; - mes "Tell me... Enumerate me... Which beings on The Mana World remains dead after being killed?"; + mes l("Tell me... Enumerate me... Which beings on The Mana World remains dead after being killed?"); next; mes "[Zax De'Kagen]"; - mes "Think a bit! Monsters respawn... Adventurers appear near the Soul Menhir..."; + mes l("Think a bit! Monsters respawn... Adventurers appear near the Soul Menhir..."); next; mes "[Zax De'Kagen]"; - mes "...Or used to, at least; I don't know why that's not true anymore... anyway..."; + mes l("...Or used to, at least; I don't know why that's not true anymore... anyway..."); next; mes "[Zax De'Kagen]"; - mes "Did you really thought you could simply defeat me in combat and expect this to solve all your problems?"; + mes l("Did you really thought you could simply defeat me in combat and expect this to solve all your problems?"); next; menu - "I did", L_Epilogue1Part21, - "I didn't", L_Epilogue1Part22; + l("I did"), L_Epilogue1Part21, + l("I didn't"), L_Epilogue1Part22; L_Epilogue1Part21: mes "[Zax De'Kagen]"; - mes "HAHAHAHAHAHAHAHA!!"; + mes l("HAHAHAHAHAHAHAHA!!"); next; goto L_Epilogue1Part2; L_Epilogue1Part22: mes "[Zax De'Kagen]"; - mes "So I assume you thought in a way to seal me? Not that it matters anymore."; + mes l("So I assume you thought in a way to seal me? Not that it matters anymore."); next; goto L_Epilogue1Part2; L_Epilogue1Part2: mes "[Zax De'Kagen]"; - mes "I'm not even close to fainting yet."; + mes l("I'm not even close to fainting yet."); next; mes "[Zax De'Kagen]"; - mes "Besides, only a handful of mana beings know how to erase something of existence."; + mes l("Besides, only a handful of mana beings know how to erase something of existence."); next; mes "[Zax De'Kagen]"; - mes "Anyway, just look! My ride arrived."; + mes l("Anyway, just look! My ride arrived."); next; @dd5_illegalexit = 0; @@ -1236,7 +1236,7 @@ L_Return: } 099-5,52,35,0 script Jande#0 NPC426,{ - message strcharinfo(0), "Jande : What are you waiting for?"; + message strcharinfo(0), "Jande : What are you waiting for?"; // npctalk3 ? end; OnInit: disablenpc strnpcinfo(0); @@ -1260,7 +1260,7 @@ OnInit: } 099-5,51,33,0 script Flying Ship NPC428,{ - message strcharinfo(0), "WHAT. IN. NAME. OF. JANDE. IS. THAT. THING?!"; + message strcharinfo(0), l("WHAT. IN. NAME. OF. JANDE. IS. THAT. THING?!"); end; OnInit: disablenpc strnpcinfo(0); @@ -1297,107 +1297,107 @@ L_Yes: OnStart: selfeffect 53; - message strcharinfo(0), "But it might be too late."; + message strcharinfo(0), l("But it might be too late."); addtimer 2300, "Gema III::OnFPS01"; end; OnFPS01: - message strcharinfo(0), "Brave adventurers from all around the world,"; + message strcharinfo(0), l("Brave adventurers from all around the world,"); addtimer 2500, "Gema III::OnFPS02"; end; OnFPS02: - message strcharinfo(0), "Marches toward that unknown island,"; + message strcharinfo(0), l("Marches toward that unknown island,"); addtimer 2100, "Gema III::OnFPS03"; end; OnFPS03: - message strcharinfo(0), "Said to have the key to stop Zax De'Kagen's ambitions."; + message strcharinfo(0), l("Said to have the key to stop Zax De'Kagen's ambitions."); addtimer 4300, "Gema III::OnFPS04"; end; OnFPS04: - message strcharinfo(0), "Unbeknownst to them, Zax already made his move."; + message strcharinfo(0), l("Unbeknownst to them, Zax already made his move."); addtimer 3200, "Gema III::OnFPS05"; end; OnFPS05: - message strcharinfo(0), "Before anyone can even reach him, he executes the plan,"; + message strcharinfo(0), l("Before anyone can even reach him, he executes the plan,"); addtimer 3600, "Gema III::OnFPS06"; end; OnFPS06: - message strcharinfo(0), "Carefully written for over a decade."; + message strcharinfo(0), l("Carefully written for over a decade."); addtimer 3100, "Gema III::OnFPS07"; end; OnFPS07: - message strcharinfo(0), "Using Nu'Rem's body as a catalyst,"; + message strcharinfo(0), l("Using Nu'Rem's body as a catalyst,"); addtimer 2000, "Gema III::OnFPS08"; end; OnFPS08: - message strcharinfo(0), "The Ether Spirit of Air is finally compromised."; + message strcharinfo(0), l("The Ether Spirit of Air is finally compromised."); addtimer 2900, "Gema III::OnFPS09"; end; OnFPS09: - message strcharinfo(0), "Half from the Etheral Powers of Air,"; + message strcharinfo(0), l("Half from the Etheral Powers of Air,"); addtimer 2300, "Gema III::OnFPS10"; end; OnFPS10: - message strcharinfo(0), "Are absorbed by The Mana Seal."; + message strcharinfo(0), l("Are absorbed by The Mana Seal."); addtimer 2100, "Gema III::OnFPS11"; end; OnFPS11: - message strcharinfo(0), "The other half collides with the Earth Spirit,"; + message strcharinfo(0), l("The other half collides with the Earth Spirit,"); addtimer 2400, "Gema III::OnFPS12"; end; OnFPS12: - message strcharinfo(0), "And a new element is born."; + message strcharinfo(0), l("And a new element is born."); addtimer 2200, "Gema III::OnFPS13"; end; OnFPS13: - message strcharinfo(0), "History begins to rewrite itself,"; + message strcharinfo(0), l("History begins to rewrite itself,"); addtimer 2200, "Gema III::OnFPS14"; end; OnFPS14: - message strcharinfo(0), "Who's Zax? Something is not right."; + message strcharinfo(0), l("Who's Zax? Something is not right."); addtimer 3600, "Gema III::OnFPS15"; end; OnFPS15: - message strcharinfo(0), "But what will be of our brave adventurers,"; + message strcharinfo(0), l("But what will be of our brave adventurers,"); addtimer 3400, "Gema III::OnFPS16"; end; OnFPS16: - message strcharinfo(0), "lost midst all this cataclysm?"; + message strcharinfo(0), l("lost midst all this cataclysm?"); addtimer 2800, "Gema III::OnFPS17"; end; OnFPS17: - message strcharinfo(0), "Will they reach Nu'Rem's grave?"; + message strcharinfo(0), l("Will they reach Nu'Rem's grave?"); addtimer 2400, "Gema III::OnFPS18"; end; OnFPS18: - message strcharinfo(0), "Will they put a stop to Zax's evil ambitions?"; + message strcharinfo(0), l("Will they put a stop to Zax's evil ambitions?"); addtimer 3000, "Gema III::OnFPS19"; end; OnFPS19: - message strcharinfo(0), "Follow their journey, and take back the world, in"; + message strcharinfo(0), l("Follow their journey, and take back the world, in"); addtimer 3600, "Gema III::OnFPS20"; end; OnFPS20: - message strcharinfo(0), "##2##BTHE MANA WORLD: REVOLT##b##0"; + message strcharinfo(0), col(b(l("THE MANA WORLD: REVOLT")), 2); //if (debug) addtimer 5000, "Gema III::OnDebugPrompt"; //if (!debug) @@ -1447,13 +1447,12 @@ L_Winner: $@DD5_TALLY$ = ""; setq Quest_Doomsday, 3; getvaultexp(250); // This is TMW's main quest, worth 50% of the EXP bar - mes "##2You were the MVP with "+$@DD5_TALLY_+" points!##0"; - //mes "##2Exchange this blue rose with a Game Master!##0"; + mesc l("You were the MVP with %s points!", fnum($@DD5_TALLY_)), 2; close; L_TooEarly: mesn strcharinfo(0); - mes "It is Gema III! How did they manage to bring the ship here?!"; + mes l("It is Gema III! How did they manage to bring the ship here?!"); close; OnInit: diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt index ab0259bb..9d75fef0 100644 --- a/npc/functions/clear_vars.txt +++ b/npc/functions/clear_vars.txt @@ -18,6 +18,22 @@ function script ClearVariables { setq Quest_Doomsday, 2; #DD5_TALLY = 0; // Whatever } + if (QL_CINDY) { + if (QL_CINDY == 5) QL_CINDY = 0; + else if (QL_CINDY == 6) QL_CINDY = 1; + else if (QL_CINDY == 1) QL_CINDY = 2; + else if (QL_CINDY == 2) QL_CINDY = 3; + else if (QL_CINDY == 3) QL_CINDY = 4; + else if (QL_CINDY == 4) QL_CINDY = 5; + setq KaizeiQuest_Cindy, QL_CINDY; + QL_CINDY = 0; + } + if (MAGIC_EXPERIENCE) { + setq1(MagicQuest_Healing, (QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); // Needed as QUEST_MAGIC2 wasn't completely deleted + setq2(MagicQuest_Healing, MAGIC_EXPERIENCE >> 24); + MAGIC_EXP = (MAGIC_EXPERIENCE & 65535); + MAGIC_EXPERIENCE = 0; + } // Don't ask me what code below does // ---------------------------------- -- cgit v1.2.3-60-g2f50