Merge branch 'master' of https://github.com/purerosefallen/ygopro-222DIY into beta

.travis.yml

@@ -9,12 +9,18 @@ addons:
     packages:
     - libevent-dev
     - libsqlite3-dev
-    - liblua5.3-dev
 before_install:
 - git submodule update --init --recursive
+
+- wget 'http://www.lua.org/ftp/lua-5.3.4.tar.gz'
+- tar zxf lua-5.3.4.tar.gz
+- cd lua-5.3.4
+- make linux test
+- sudo make install
+- cd ..
+
 - wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha10/premake-5.0.0-alpha10-linux.tar.gz | tar zfx -
 script:
 - ./premake5 gmake
 - cd build
-- sed -i 's/-llua/-llua5.3/g' ygopro.make
 - make config=release

expansions/script/c37564056.lua

@@ -96,10 +96,10 @@ function cm.replace_register_effect(f,p)
 	end
 end
 function cm.replace_function(of)
-	return function(e,tp,eg,ep,ev,re,r,rp,chk)
+	return function(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		local f=Duel.IsPlayerAffectedByEffect
 		Duel.IsPlayerAffectedByEffect=cm.replace_affected_by_effect(f)
-		local res=(not of or of(e,tp,eg,ep,ev,re,r,rp,chk))
+		local res=(not of or of(e,tp,eg,ep,ev,re,r,rp,chk,chkc))
 		Duel.IsPlayerAffectedByEffect=f
 		return res
 	end

ocgcore/common.h

@@ -38,9 +38,12 @@ typedef int BOOL;
 #ifndef NULL
 #define NULL 0
 #endif
-#define lua_tonumberint(L,i) (lua_Integer)(((lua_tonumberx(L, (i), NULL) > 0) ? 0.5 : -0.5) + lua_tonumberx(L, (i), NULL))
 struct card_sort {
 	bool operator()(void* const & c1, void* const & c2) const;
 };
 
 #endif /* COMMON_H_ */
+#ifndef MODDED_TONUMBER
+#define MODDED_TONUMBER
+#define lua_tonumberint(L,i) (lua_Integer)(((lua_tonumberx(L, (i), NULL) > 0) ? 0.5 : -0.5) + lua_tonumberx(L, (i), NULL))
+#endif

ocgcore/playerop.cpp

@@ -378,7 +378,9 @@ int32 field::select_chain(uint16 step, uint8 playerid, uint8 spe_count, uint8 fo
 		}
 		return FALSE;
 	} else {
-		if((returns.ivalue[0] < 0 && forced) || returns.ivalue[0] >= (int32)core.select_chains.size()) {
+		if(!forced && returns.ivalue[0] == -1)
+			return TRUE;
+		if(returns.ivalue[0] < 0 || returns.ivalue[0] >= (int32)core.select_chains.size()) {
 			pduel->write_buffer8(MSG_RETRY);
 			return FALSE;
 		}
@@ -734,7 +736,7 @@ int32 field::sort_card(int16 step, uint8 playerid, uint8 is_chain) {
 	if(step == 0) {
 		returns.bvalue[0] = 0;
 		if((playerid == 1) && (core.duel_options & DUEL_SIMPLE_AI)) {
-			returns.ivalue[0] = -1;
+			returns.bvalue[0] = -1;
 			return TRUE;
 		}
 		if(core.select_cards.empty())