Update

field.h

@@ -547,7 +547,7 @@ public:
 	int32 select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable, int32 min, int32 max);
 	int32 toss_coin(uint16 step, effect* reason_effect, uint8 reason_player, uint8 playerid, uint8 count);
 	int32 toss_dice(uint16 step, effect* reason_effect, uint8 reason_player, uint8 playerid, uint8 count1, uint8 count2);
-	int32 rock_paper_scissors(uint16 step);
+	int32 rock_paper_scissors(uint16 step, uint8 repeat);
 
 	int32 select_battle_command(uint16 step, uint8 playerid);
 	int32 select_idle_command(uint16 step, uint8 playerid);

libduel.cpp

@@ -2986,7 +2986,10 @@ int32 scriptlib::duel_toss_dice(lua_State * L) {
 }
 int32 scriptlib::duel_rock_paper_scissors(lua_State * L) {
 	duel* pduel = interpreter::get_duel_info(L);
-	pduel->game_field->add_process(PROCESSOR_ROCK_PAPER_SCISSORS, 1, 0, 0, 0, 0);
+	uint8 repeat = TRUE;
+	if (lua_gettop(L) > 0)
+		repeat = lua_toboolean(L, 1);
+	pduel->game_field->add_process(PROCESSOR_ROCK_PAPER_SCISSORS, 1, 0, 0, repeat, 0);
 	return lua_yield(L, 0);
 }
 int32 scriptlib::duel_get_coin_result(lua_State * L) {

operations.cpp

@@ -5374,7 +5374,7 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player,
 	}
 	return TRUE;
 }
-int32 field::rock_paper_scissors(uint16 step) {
+int32 field::rock_paper_scissors(uint16 step, uint8 repeat) {
 	switch (step) {
 	case 1: {
 		pduel->write_buffer8(MSG_ROCK_PAPER_SCISSORS);
@@ -5382,22 +5382,24 @@ int32 field::rock_paper_scissors(uint16 step) {
 		return FALSE;
 	}
 	case 2: {
-		core.units.begin()->arg1 = returns.ivalue[0];
+		core.units.begin()->arg2 = returns.ivalue[0];
 		pduel->write_buffer8(MSG_ROCK_PAPER_SCISSORS);
 		pduel->write_buffer8(1);
 		return FALSE;
 	}
 	case 3: {
-		core.units.begin()->arg2 = returns.ivalue[0];
+		core.units.begin()->arg2 = core.units.begin()->arg2 + (returns.ivalue[0] << 2);
 		pduel->write_buffer8(MSG_HAND_RES);
-		pduel->write_buffer8(core.units.begin()->arg1);
 		pduel->write_buffer8(core.units.begin()->arg2);
-		if(core.units.begin()->arg1 == core.units.begin()->arg2) {
+		if((core.units.begin()->arg2 & 0x3) == ((core.units.begin()->arg2 >> 2) & 0x3)) {
+			if(repeat) {
 				core.units.begin()->step = 0;
 				return FALSE;
-		} else if((core.units.begin()->arg1 == 1 && core.units.begin()->arg2 == 2)
-		          || (core.units.begin()->arg1 == 2 && core.units.begin()->arg2 == 3)
-		          || (core.units.begin()->arg1 == 3 && core.units.begin()->arg2 == 1)) {
+			} else
+				returns.ivalue[0] = PLAYER_NONE;
+		} else if(((core.units.begin()->arg2 & 0x3) == 1 && ((core.units.begin()->arg2 >> 2) & 0x3) == 2)
+		          || ((core.units.begin()->arg2 & 0x3) == 2 && ((core.units.begin()->arg2 >> 2) & 0x3) == 3)
+		          || ((core.units.begin()->arg2 & 0x3) == 3 && ((core.units.begin()->arg2 >> 2) & 0x3) == 1)) {
 			returns.ivalue[0] = 1;
 		} else {
 			returns.ivalue[0] = 0;

processor.cpp

@@ -618,7 +618,7 @@ int32 field::process() {
 		return pduel->bufferlen;
 	}
 	case PROCESSOR_ROCK_PAPER_SCISSORS: {
-		if (rock_paper_scissors(it->step)) {
+		if (rock_paper_scissors(it->step, it->arg1)) {
 			pduel->lua->add_param(returns.ivalue[0], PARAM_TYPE_INT);
 			core.units.pop_front();
 		} else