Skip to content

Y
ygopro-core
Commit 038ecdfe authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

tweak

parent e90ab044
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
libduel.cpp
View file @ 038ecdfe
...@@ -3057,7 +3057,7 @@ int32 scriptlib::duel_rock_paper_scissors(lua_State * L) { ...@@ -3057,7 +3057,7 @@ int32 scriptlib::duel_rock_paper_scissors(lua_State * L) {
uint8 repeat = TRUE; uint8 repeat = TRUE;
if (lua_gettop(L) > 0) if (lua_gettop(L) > 0)
repeat = lua_toboolean(L, 1); repeat = lua_toboolean(L, 1);
pduel->game_field->add_process(PROCESSOR_ROCK_PAPER_SCISSORS, 1, 0, 0, repeat, 0); pduel->game_field->add_process(PROCESSOR_ROCK_PAPER_SCISSORS, 0, 0, 0, repeat, 0);
return lua_yield(L, 0); return lua_yield(L, 0);
} }
int32 scriptlib::duel_get_coin_result(lua_State * L) { int32 scriptlib::duel_get_coin_result(lua_State * L) {
......
operations.cpp
View file @ 038ecdfe
...@@ -5520,30 +5520,29 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player, ...@@ -5520,30 +5520,29 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player,
} }
int32 field::rock_paper_scissors(uint16 step, uint8 repeat) { int32 field::rock_paper_scissors(uint16 step, uint8 repeat) {
switch (step) { switch (step) {
case 1: { case 0: {
pduel->write_buffer8(MSG_ROCK_PAPER_SCISSORS); pduel->write_buffer8(MSG_ROCK_PAPER_SCISSORS);
pduel->write_buffer8(0); pduel->write_buffer8(0);
return FALSE; return FALSE;
} }
case 2: { case 1: {
core.units.begin()->arg2 = returns.ivalue[0]; core.units.begin()->arg2 = returns.ivalue[0];
pduel->write_buffer8(MSG_ROCK_PAPER_SCISSORS); pduel->write_buffer8(MSG_ROCK_PAPER_SCISSORS);
pduel->write_buffer8(1); pduel->write_buffer8(1);
return FALSE; return FALSE;
} }
case 3: { case 2: {
core.units.begin()->arg2 = core.units.begin()->arg2 + (returns.ivalue[0] << 2); int32 hand0 = core.units.begin()->arg2;
int32 hand1 = returns.ivalue[0];
pduel->write_buffer8(MSG_HAND_RES); pduel->write_buffer8(MSG_HAND_RES);
pduel->write_buffer8(core.units.begin()->arg2); pduel->write_buffer8(hand0 + (hand1 << 2));
if((core.units.begin()->arg2 & 0x3) == ((core.units.begin()->arg2 >> 2) & 0x3)) { if(hand0 == hand1) {
if(repeat) { if(repeat) {
core.units.begin()->step = 0; core.units.begin()->step = -1;
return FALSE; return FALSE;
} else } else
returns.ivalue[0] = PLAYER_NONE; returns.ivalue[0] = PLAYER_NONE;
} else if(((core.units.begin()->arg2 & 0x3) == 1 && ((core.units.begin()->arg2 >> 2) & 0x3) == 2) } else if((hand0 == 1 && hand1 == 2) || (hand0 == 2 && hand1 == 3) || (hand0 == 3 && hand1 == 1)) {
|| ((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; returns.ivalue[0] = 1;
} else { } else {
returns.ivalue[0] = 0; returns.ivalue[0] = 0;
...@@ -5551,4 +5550,5 @@ int32 field::rock_paper_scissors(uint16 step, uint8 repeat) { ...@@ -5551,4 +5550,5 @@ int32 field::rock_paper_scissors(uint16 step, uint8 repeat) {
return TRUE; return TRUE;
} }
} }
return TRUE;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment