Commit 21824200 authored by DailyShana's avatar DailyShana

revert #74

parent 5d337656
...@@ -294,8 +294,6 @@ struct processor { ...@@ -294,8 +294,6 @@ struct processor {
uint8 attack_state_count[2]; uint8 attack_state_count[2];
uint8 battle_phase_count[2]; uint8 battle_phase_count[2];
uint8 battled_count[2]; uint8 battled_count[2];
uint8 tossed_coin_count[2];
uint8 tossed_dice_count[2];
uint8 phase_action; uint8 phase_action;
uint32 hint_timing[2]; uint32 hint_timing[2];
uint8 current_player; uint8 current_player;
......
...@@ -506,8 +506,6 @@ static const struct luaL_Reg duellib[] = { ...@@ -506,8 +506,6 @@ static const struct luaL_Reg duellib[] = {
{ "AddCustomActivityCounter", scriptlib::duel_add_custom_activity_counter }, { "AddCustomActivityCounter", scriptlib::duel_add_custom_activity_counter },
{ "GetCustomActivityCount", scriptlib::duel_get_custom_activity_count }, { "GetCustomActivityCount", scriptlib::duel_get_custom_activity_count },
{ "GetBattledCount", scriptlib::duel_get_battled_count }, { "GetBattledCount", scriptlib::duel_get_battled_count },
{ "GetTossedCoinCount", scriptlib::duel_get_tossed_coin_count },
{ "GetTossedDiceCount", scriptlib::duel_get_tossed_dice_count },
{ "IsAbleToEnterBP", scriptlib::duel_is_able_to_enter_bp }, { "IsAbleToEnterBP", scriptlib::duel_is_able_to_enter_bp },
{ "VenomSwampCheck", scriptlib::duel_venom_swamp_check }, { "VenomSwampCheck", scriptlib::duel_venom_swamp_check },
{ "SwapDeckAndGrave", scriptlib::duel_swap_deck_and_grave }, { "SwapDeckAndGrave", scriptlib::duel_swap_deck_and_grave },
......
...@@ -3417,24 +3417,6 @@ int32 scriptlib::duel_get_battled_count(lua_State *L) { ...@@ -3417,24 +3417,6 @@ int32 scriptlib::duel_get_battled_count(lua_State *L) {
lua_pushinteger(L, pduel->game_field->core.battled_count[playerid]); lua_pushinteger(L, pduel->game_field->core.battled_count[playerid]);
return 1; return 1;
} }
int32 scriptlib::duel_get_tossed_coin_count(lua_State *L) {
check_param_count(L, 1);
int32 playerid = lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1)
return 0;
duel* pduel = interpreter::get_duel_info(L);
lua_pushinteger(L, pduel->game_field->core.tossed_coin_count[playerid]);
return 1;
}
int32 scriptlib::duel_get_tossed_dice_count(lua_State *L) {
check_param_count(L, 1);
int32 playerid = lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1)
return 0;
duel* pduel = interpreter::get_duel_info(L);
lua_pushinteger(L, pduel->game_field->core.tossed_dice_count[playerid]);
return 1;
}
int32 scriptlib::duel_is_able_to_enter_bp(lua_State *L) { int32 scriptlib::duel_is_able_to_enter_bp(lua_State *L) {
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
lua_pushboolean(L, pduel->game_field->is_able_to_enter_bp()); lua_pushboolean(L, pduel->game_field->is_able_to_enter_bp());
......
...@@ -5051,7 +5051,6 @@ int32 field::toss_coin(uint16 step, effect * reason_effect, uint8 reason_player, ...@@ -5051,7 +5051,6 @@ int32 field::toss_coin(uint16 step, effect * reason_effect, uint8 reason_player,
pduel->write_buffer8(count); pduel->write_buffer8(count);
for(int32 i = 0; i < count; ++i) { for(int32 i = 0; i < count; ++i) {
core.coin_result[i] = pduel->get_next_integer(0, 1); core.coin_result[i] = pduel->get_next_integer(0, 1);
core.tossed_coin_count[playerid]++;
pduel->write_buffer8(core.coin_result[i]); pduel->write_buffer8(core.coin_result[i]);
} }
raise_event((card*)0, EVENT_TOSS_COIN_NEGATE, reason_effect, 0, reason_player, playerid, count); raise_event((card*)0, EVENT_TOSS_COIN_NEGATE, reason_effect, 0, reason_player, playerid, count);
...@@ -5097,7 +5096,6 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player, ...@@ -5097,7 +5096,6 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player,
pduel->write_buffer8(count1); pduel->write_buffer8(count1);
for(int32 i = 0; i < count1; ++i) { for(int32 i = 0; i < count1; ++i) {
core.dice_result[i] = pduel->get_next_integer(1, 6); core.dice_result[i] = pduel->get_next_integer(1, 6);
core.tossed_dice_count[playerid]++;
pduel->write_buffer8(core.dice_result[i]); pduel->write_buffer8(core.dice_result[i]);
} }
if(count2 > 0) { if(count2 > 0) {
...@@ -5106,7 +5104,6 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player, ...@@ -5106,7 +5104,6 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player,
pduel->write_buffer8(count2); pduel->write_buffer8(count2);
for(int32 i = 0; i < count2; ++i) { for(int32 i = 0; i < count2; ++i) {
core.dice_result[count1 + i] = pduel->get_next_integer(1, 6); core.dice_result[count1 + i] = pduel->get_next_integer(1, 6);
core.tossed_dice_count[1 - playerid]++;
pduel->write_buffer8(core.dice_result[count1 + i]); pduel->write_buffer8(core.dice_result[count1 + i]);
} }
} }
......
...@@ -3936,8 +3936,6 @@ int32 field::process_turn(uint16 step, uint8 turn_player) { ...@@ -3936,8 +3936,6 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
core.attack_state_count[p] = 0; core.attack_state_count[p] = 0;
core.battle_phase_count[p] = 0; core.battle_phase_count[p] = 0;
core.battled_count[p] = 0; core.battled_count[p] = 0;
core.tossed_coin_count[p] = 0;
core.tossed_dice_count[p] = 0;
core.summon_count[p] = 0; core.summon_count[p] = 0;
core.extra_summon[p] = 0; core.extra_summon[p] = 0;
core.spsummon_once_map[p].clear(); core.spsummon_once_map[p].clear();
......
...@@ -507,8 +507,6 @@ public: ...@@ -507,8 +507,6 @@ public:
static int32 duel_get_custom_activity_count(lua_State *L); static int32 duel_get_custom_activity_count(lua_State *L);
static int32 duel_is_able_to_enter_bp(lua_State *L); static int32 duel_is_able_to_enter_bp(lua_State *L);
static int32 duel_get_battled_count(lua_State *L); static int32 duel_get_battled_count(lua_State *L);
static int32 duel_get_tossed_coin_count(lua_State *L);
static int32 duel_get_tossed_dice_count(lua_State *L);
//specific card functions //specific card functions
static int32 duel_venom_swamp_check(lua_State *L); static int32 duel_venom_swamp_check(lua_State *L);
......
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