Merge branch 'dev' of github.com:QSanguosha/QSanguosha-For-Hegemony i…

…nto dev
Mogara · Nov 29, 2014 · f52272a · f52272a
2 parents f9aaacc + 1534bcc
commit f52272a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/builds/sanguosha.ts b/builds/sanguosha.ts
@@ -3026,17 +3026,17 @@
     <message>
         <location filename="../src/core/record-analysis.cpp" line="424"/>
         <source>Awe Prestige</source>
-        <translation>天道威仪</translation>
+        <translation>魏武挥鞭</translation>
     </message>
     <message>
         <location filename="../src/core/record-analysis.cpp" line="426"/>
         <source>Wisely Loyalist</source>
-        <translation>能臣巧吏</translation>
+        <translation>汉室复兴</translation>
     </message>
     <message>
         <location filename="../src/core/record-analysis.cpp" line="427"/>
         <source>Conspiracy</source>
-        <translation>老谋深算</translation>
+        <translation>雄霸天下</translation>
     </message>
     <message>
         <location filename="../src/core/record-analysis.cpp" line="429"/>
@@ -3066,7 +3066,7 @@
     <message>
         <location filename="../src/core/record-analysis.cpp" line="449"/>
         <source>Break Point</source>
-        <translation>直捣黄龙</translation>
+        <translation>吴王光耀</translation>
     </message>
     <message>
         <location filename="../src/core/record-analysis.cpp" line="451"/>
@@ -3076,7 +3076,7 @@
     <message>
         <location filename="../src/core/record-analysis.cpp" line="452"/>
         <source>Frightful Lord</source>
-        <translation>势敌万军</translation>
+        <translation>苍天航路</translation>
     </message>
     <message>
         <location filename="../src/core/record-analysis.cpp" line="453"/>
@@ -3131,12 +3131,12 @@
     <message>
         <location filename="../src/core/record-analysis.cpp" line="470"/>
         <source>Priority Honor</source>
-        <translation>竭忠尽智</translation>
+        <translation>季汉能臣</translation>
     </message>
     <message>
         <location filename="../src/core/record-analysis.cpp" line="471"/>
         <source>Impasse Strike</source>
-        <translation>华丽的逆袭</translation>
+        <translation>江东俊杰</translation>
     </message>
 </context>
 <context>

diff --git a/lua/ai/smart-ai.lua b/lua/ai/smart-ai.lua
@@ -1896,7 +1896,7 @@ function SmartAI:filterEvent(event, player, data)
 					local count = self.room:getTag("SwapPile"):toInt()
 					for _, p in sgs.qlist(self.room:getOtherPlayers(to)) do
 						if sgs.ai_guangxing[p:objectName()][count] and table.contains(sgs.ai_guangxing[p:objectName()][count], tostring(card_id)) then
-							table.removeOne(sgs.ai_guangxing[p:objectName()][count], card_id)
+							table.remove(sgs.ai_guangxing[p:objectName()][count], card_id)
 							local flag = string.format("%s_%s_%s", "visible", p:objectName(), to:objectName())
 							self.room:setCardFlag(card_id, flag, p)
 						end