v1.3 complete

.gitignore

@@ -6,6 +6,7 @@
 /6_finalprod/zh_CN/mm8_with_GrayFace/
 /6_finalprod/zh_CN/*.zip
 /non_text/sound/
+/non_text/scripts_datatables/original-merge/
 /tools/input/
 /tools/output/
 *.baiduyun.uploading.cfg

0_source/en/mmmerge/Data/01LocLANG.EnglishT/BrAlvar.STR

@@ -0,0 +1,5 @@
+
+Your friends have disappeared!
+Someone shouts: "Prince Nicolai have been kidnapped!".
+Door won't budge!
+Button won't budge.

0_source/en/mmmerge/Data/01LocLANG.EnglishT/BrBase.STR

@@ -0,0 +1,6 @@
+
+Exit Breach Basement.
+Go up to the %sth floor.
+Go down to the %sth floor.
+Trap disarmed!
+Trap!

0_source/en/mmmerge/Data/01LocLANG.EnglishT/NPCText.txt

@@ -3087,4 +3087,20 @@ And then the being spoke to me, in a voice so calm, my own shivers ceased. 
 2694	n/a		
 2695	Your paltry wealth isn't enough to even tempt me.  I will not be bribed.		
 2696	n/a		
-2697	I will not bow to your threats!		
+2697	I will not bow to your threats!		
+2698	Jars. Yessss. You have helped us greatly.	See Scripts/Global/PromotionTopics.lua	
+2699	Join guild	See Scripts/Global/PromotionTopics.lua	
+2700	Well, sorcerers among you seeking for power of dark arts? Pay 10000 bill and step into our chambers.	See Scripts/Global/PromotionTopics.lua	
+2701	We will not allow any rambler to sneak here. Pay and study or scram!	See Scripts/Global/PromotionTopics.lua	
+2702	Perfect! Now i call all sorcerers among you necromancers, don't pretend to be good anymore.	See Scripts/Global/PromotionTopics.lua	
+2703	Welcome, necromancers.	See Scripts/Global/PromotionTopics.lua	
+2704	, 	See Scripts/Global/Quest_SavingGoobers.lua	
+2705	(	See Scripts/Global/Quest_SavingGoobers.lua	
+2706	)	See Scripts/Global/Quest_SavingGoobers.lua	
+2707	Well, this is %s.	See Scripts/Global/Quest_SavingGoobers.lua	
+2708	Done!	See Scripts/Global/Quest_SavingGoobers.lua	
+2709	Anya Charo	See Scripts/Global/Quest_CrossContinents.lua	
+2710	Wan Ruchos	See Scripts/Global/Quest_CrossContinents.lua	
+2711	Noah Charo	See Scripts/Global/Quest_CrossContinents.lua	
+2712	Chan Os Wy	See Scripts/Global/Quest_CrossContinents.lua	
+2713	R.C. Wosch	See Scripts/Global/Quest_CrossContinents.lua	

3_i18n/mm678.pot

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Might and Magic 6 7 8 Translation\n"
-"POT-Creation-Date: 2020-03-01 01:21+0100\n"
+"POT-Creation-Date: 2020-03-02 12:19+0100\n"
 "PO-Revision-Date: 2020-02-05 19:47+0100\n"
 "Last-Translator: Tom Chen <[email protected]>\n"
 "Language-Team: Might and Magic Unofficial Translation Team\n"
@@ -6663,6 +6663,7 @@ msgstr ""
 
 #: mm6/data/Icons/D08.STR.py:11 mm6/data/Icons/PYRAMID.STR.py:4
 #: mmmerge/Data/01LocLANG.EnglishT/6d08.STR.py:11
+#: mmmerge/Data/01LocLANG.EnglishT/BrBase.STR.py:6
 #: mmmerge/Data/01LocLANG.EnglishT/PYRAMID.STR.py:4
 msgctxt "location"
 msgid "Trap!"
@@ -39079,6 +39080,12 @@ msgstr ""
 #: mm6/data/Icons/npcbtb.txt.py:24 mm6/data/Icons/npcbtb.txt.py:25
 #: mm6/data/Icons/npcbtb.txt.py:26 mm6/data/Icons/npcbtb.txt.py:27
 #: mm6/data/Icons/npcbtb.txt.py:28
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2394
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2396
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2398
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2419
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2421
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2423
 #: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2427
 #: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2443
 #: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2446
@@ -112275,6 +112282,48 @@ msgctxt "autonote or awards"
 msgid "Protection from Magic = Cure Insanity + Bless"
 msgstr ""
 
+#: mmmerge/Data/01LocLANG.EnglishT/BrAlvar.STR.py:2
+msgctxt "location"
+msgid "Your friends have disappeared!"
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/BrAlvar.STR.py:3
+msgctxt "location"
+msgid "Someone shouts: \"Prince Nicolai have been kidnapped!\"."
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/BrAlvar.STR.py:4
+msgctxt "location"
+msgid "Door won't budge!"
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/BrAlvar.STR.py:5
+msgctxt "location"
+msgid "Button won't budge."
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/BrBase.STR.py:2
+msgctxt "location"
+msgid "Exit Breach Basement."
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/BrBase.STR.py:3
+#, python-format
+msgctxt "location"
+msgid "Go up to the %sth floor."
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/BrBase.STR.py:4
+#, python-format
+msgctxt "location"
+msgid "Go down to the %sth floor."
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/BrBase.STR.py:5
+msgctxt "location"
+msgid "Trap disarmed!"
+msgstr ""
+
 #: mmmerge/Data/01LocLANG.EnglishT/Breach.STR.py:2
 msgctxt "location"
 msgid "Once you've put the Telelocator into empty slot, Breach has changed, you can not see any landscape behind it. Will you dare to enter? (Y/N)"
@@ -113677,36 +113726,87 @@ msgctxt "npc conversation"
 msgid "Not quite, friend, not quite."
 msgstr ""
 
-#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2394
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2699
 msgctxt "npc conversation"
 msgid "Jars. Yessss. You have helped us greatly."
 msgstr ""
 
-#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2396
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2700
 msgctxt "npc conversation"
 msgid "Join guild"
 msgstr ""
 
-#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2398
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2701
 msgctxt "npc conversation"
 msgid "Well, sorcerers among you seeking for power of dark arts? Pay 10000 bill and step into our chambers."
 msgstr ""
 
-#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2419
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2702
 msgctxt "npc conversation"
 msgid "We will not allow any rambler to sneak here. Pay and study or scram!"
 msgstr ""
 
-#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2421
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2703
 msgctxt "npc conversation"
 msgid "Perfect! Now i call all sorcerers among you necromancers, don't pretend to be good anymore."
 msgstr ""
 
-#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2423
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2704
 msgctxt "npc conversation"
 msgid "Welcome, necromancers."
 msgstr ""
 
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2705
+msgctxt "npc conversation"
+msgid ", "
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2706
+msgctxt "npc conversation"
+msgid "("
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2707
+msgctxt "npc conversation"
+msgid ")"
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2708
+#, python-format
+msgctxt "npc conversation"
+msgid "Well, this is %s."
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2709
+msgctxt "npc conversation"
+msgid "Done!"
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2710
+msgctxt "npc conversation"
+msgid "Anya Charo"
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2711
+msgctxt "npc conversation"
+msgid "Wan Ruchos"
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2712
+msgctxt "npc conversation"
+msgid "Noah Charo"
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2713
+msgctxt "npc conversation"
+msgid "Chan Os Wy"
+msgstr ""
+
+#: mmmerge/Data/01LocLANG.EnglishT/NPCText.txt.py:2714
+msgctxt "npc conversation"
+msgid "R.C. Wosch"
+msgstr ""
+
 #: mmmerge/Data/01LocLANG.EnglishT/NPCTopic.txt.py:73
 msgctxt "npctopic"
 msgid "Balthazar of "