Skip to content

Y
ygopro
Commit df559dbc authored by edo9300's avatar edo9300
Browse files
Options

Updated rule cards

parent 2d1a7e6e
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 105 deletions
gframe/duelclient.cpp
View file @ df559dbc
......@@ -122,19 +122,18 @@ void DuelClient::ClientEvent(bufferevent *bev, short events, void *ctx) {
cscg.info.duel_rule = mainGame->cbDuelRule->getSelected() + 1;
cscg.info.no_check_deck = mainGame->chkNoCheckDeck->isChecked();
cscg.info.no_shuffle_deck = mainGame->chkNoShuffleDeck->isChecked();
cscg.info.destiny_draw = mainGame->chkDrawDestiny->isChecked() ? 2 : 0;
cscg.info.sealed = mainGame->chkRules[0]->isChecked() ? 2 : 0;
cscg.info.booster = mainGame->chkRules[1]->isChecked() ? 2 : 0;
cscg.info.action = mainGame->chkRules[2]->isChecked() ? 2 : 0;
cscg.info.destiny_draw = mainGame->chkRules[2]->isChecked() ? 2 : 0;
cscg.info.speed = mainGame->chkRules[3]->isChecked() ? 2 : 0;
cscg.info.concentration = mainGame->chkRules[4]->isChecked() ? 2 : 0;
cscg.info.boss = mainGame->chkRules[5]->isChecked() ? 2 : 0;
cscg.info.city = mainGame->chkRules[6]->isChecked() ? 2 : 0;
cscg.info.kingdom = mainGame->chkRules[7]->isChecked() ? 2 : 0;
cscg.info.rose = mainGame->chkRules[8]->isChecked() ? 2 : 0;
cscg.info.turbo1 = mainGame->chkRules[9]->isChecked() ? 2 : 0;
cscg.info.dimension = mainGame->chkRules[8]->isChecked() ? 2 : 0;
cscg.info.doubled = mainGame->chkRules[9]->isChecked() ? 2 : 0;
cscg.info.turbo2 = mainGame->chkRules[10]->isChecked() ? 2 : 0;
cscg.info.doubled = mainGame->chkRules[11]->isChecked() ? 2 : 0;
cscg.info.turbo1 = mainGame->chkRules[11]->isChecked() ? 2 : 0;
cscg.info.command = mainGame->chkRules[12]->isChecked() ? 2 : 0;
cscg.info.master = mainGame->chkRules[13]->isChecked() ? 2 : 0;
cscg.info.rule_count = 0;
......@@ -360,11 +359,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1260 + pkt->info.duel_rule - 1));
str.append(msgbuf);
}
if(pkt->info.destiny_draw==2) {
myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1626));
str.append(msgbuf);
host2 = true;
}
if(pkt->info.no_check_deck) {
myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1229));
str.append(msgbuf);
......@@ -373,6 +367,11 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1230));
str.append(msgbuf);
}
if(pkt->info.destiny_draw==2) {
myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1134));
str2.append(msgbuf);
host2 = true;
}
if(pkt->info.sealed == 2) {
myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1132));
str2.append(msgbuf);
......@@ -383,11 +382,6 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
str2.append(msgbuf);
host2 = true;
}
if(pkt->info.action == 2) {
myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1134));
str2.append(msgbuf);
host2 = true;
}
if(pkt->info.speed == 2) {
myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1135));
str2.append(msgbuf);
......@@ -413,12 +407,12 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
str2.append(msgbuf);
host2 = true;
}
if(pkt->info.rose == 2) {
if(pkt->info.dimension == 2) {
myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1140));
str2.append(msgbuf);
host2 = true;
}
if(pkt->info.turbo1 == 2) {
if(pkt->info.doubled == 2) {
myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1141));
str2.append(msgbuf);
host2 = true;
......@@ -428,7 +422,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
str2.append(msgbuf);
host2 = true;
}
if(pkt->info.doubled == 2) {
if(pkt->info.turbo1 == 2) {
myswprintf(msgbuf, L"*%ls\n", dataManager.GetSysString(1143));
str2.append(msgbuf);
host2 = true;
......@@ -3814,7 +3808,7 @@ void DuelClient::BroadcastReply(evutil_socket_t fd, short events, void * arg) {
/*int ret = */recvfrom(fd, buf, 256, 0, (sockaddr*)&bc_addr, &sz);
unsigned int ipaddr = bc_addr.sin_addr.s_addr;
HostPacket* pHP = (HostPacket*)buf;
if(!is_closing && pHP->identifier == NETWORK_SERVER_ID && pHP->version == PRO_VERSION && remotes.find(ipaddr) == remotes.end() ) {
if(!is_closing && pHP->identifier == NETWORK_SERVER_ID/* && pHP->version == PRO_VERSION*/ && remotes.find(ipaddr) == remotes.end() ) {
wchar_t msgbuf[256];
mainGame->gMutex.Lock();
remotes.insert(ipaddr);
......@@ -3828,6 +3822,9 @@ void DuelClient::BroadcastReply(evutil_socket_t fd, short events, void * arg) {
hoststr.append(L"][");
hoststr.append(dataManager.GetSysString(pHP->host.mode + 1244));
hoststr.append(L"][");
myswprintf(msgbuf, L"%X.0%X.%X", pHP->version >> 12, (pHP->version >> 4) & 0xff, pHP->version & 0xf);
hoststr.append(msgbuf);
hoststr.append(L"][");
myswprintf(msgbuf, L"MR %d", (pHP->host.duel_rule == 0) ? 3 : pHP->host.duel_rule);
hoststr.append(msgbuf);
hoststr.append(L"][");
......
gframe/game.cpp
View file @ df559dbc
......@@ -161,7 +161,6 @@ bool Game::Initialize() {
btnRulesOK = env->addButton(rect<s32>(135, 175, 235, 200), wRules, BUTTON_RULE_OK, dataManager.GetSysString(1211));
for(int i = 0; i < 14; ++i)
chkRules[i] = env->addCheckBox(false, recti(10 + (i % 2) * 150, 10 + (i / 2) * 20, 200 + (i % 2) * 120, 30 + (i / 2) * 20), wRules, 353+i, dataManager.GetSysString(1132 + i));
chkDrawDestiny = env->addCheckBox(false, rect<s32>(180, 180, 360, 200), wCreateHost, -1, dataManager.GetSysString(1626));
env->addStaticText(dataManager.GetSysString(1236), rect<s32>(20, 180, 220, 200), false, false, wCreateHost);
cbDuelRule = env->addComboBox(rect<s32>(140, 175, 300, 200), wCreateHost);
cbDuelRule->addItem(dataManager.GetSysString(1260));
......
gframe/game.h
View file @ df559dbc
......@@ -266,7 +266,6 @@ public:
irr::gui::IGUIWindow* wRules;
irr::gui::IGUICheckBox* chkRules[14];
irr::gui::IGUIButton* btnRulesOK;
irr::gui::IGUICheckBox* chkDrawDestiny;
irr::gui::IGUIComboBox* cbDuelRule;
irr::gui::IGUICheckBox* chkNoCheckDeck;
irr::gui::IGUICheckBox* chkNoShuffleDeck;
......@@ -607,16 +606,16 @@ extern Game* mainGame;
#define BUTTON_CANCEL_SINGLEPLAY 352
#define CHECK_SEALED_DUEL 353
#define CHECK_BOOSTER_DUEL 354
#define CHECK_ACTION_DUEL 355
#define CHECK_DESTINY_DRAW 355
#define CHECK_SPEED_DUEL 356
#define CHECK_CONCENTRATION_DUEL 357
#define CHECK_BOSS_DUEL 358
#define CHECK_BATTLE_CITY 359
#define CHECK_DUELIST_KINGDOM 360
#define CHECK_ROSE_DUEL 361
#define CHECK_TURBO_DUEL_1 362
#define CHECK_DIMENSION_DUEL 361
#define CHECK_DOUBLE_DECK 362
#define CHECK_TURBO_DUEL_2 363
#define CHECK_DOUBLE_DECK 364
#define CHECK_TURBO_DUEL_1 364
#define CHECK_COMMAND_DUEL 365
#define CHECK_DECK_MASTER_DUEL 366
#define CHECKBOX_ENABLE_MUSIC 361
......
gframe/menu_handler.cpp
View file @ df559dbc
......@@ -385,12 +385,12 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
case CHECK_SEALED_DUEL: {
if (static_cast<irr::gui::IGUICheckBox*>(caller)->isChecked()) {
for (int i = 1; i < 14; ++i)
if (i != 3 && i != 11)
if (i != 2 && i != 3 && i != 9)
mainGame->chkRules[i]->setEnabled(false);
}
else {
for (int i = 1; i < 14; ++i)
if (i != 3 && i != 11)
if (i != 2 && i != 3 && i != 9)
mainGame->chkRules[i]->setEnabled(true);
}
break;
......@@ -398,41 +398,20 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
case CHECK_BOOSTER_DUEL: {
if (static_cast<irr::gui::IGUICheckBox*>(caller)->isChecked()) {
for (int i = 0; i < 14; ++i)
if(i != 1 && i != 3 && i != 11)
if(i != 1 && i != 2 && i != 3 && i != 9)
mainGame->chkRules[i]->setEnabled(false);
}
else {
for (int i = 0; i < 14; ++i)
if (i != 1 && i != 3 && i != 11)
if (i != 1 && i != 2 && i != 3 && i != 9)
mainGame->chkRules[i]->setEnabled(true);
}
break;
}
case CHECK_ACTION_DUEL: {
if (static_cast<irr::gui::IGUICheckBox*>(caller)->isChecked()) {
mainGame->chkRules[0]->setEnabled(false);
mainGame->chkRules[1]->setEnabled(false);
mainGame->chkRules[9]->setEnabled(false);
mainGame->chkRules[10]->setEnabled(false);
}
else {
mainGame->chkRules[0]->setEnabled(true);
mainGame->chkRules[1]->setEnabled(true);
mainGame->chkRules[9]->setEnabled(true);
mainGame->chkRules[10]->setEnabled(true);
for (int i = 0; i < 14; ++i) {
if (mainGame->chkRules[i]->isChecked() && i != 3 && i != 11)
for (int i = 0; i < 2; ++i)
mainGame->chkRules[i]->setEnabled(false);
}
}
break;
}
case CHECK_CONCENTRATION_DUEL:
case CHECK_BOSS_DUEL:
case CHECK_BATTLE_CITY:
case CHECK_DUELIST_KINGDOM:
case CHECK_ROSE_DUEL:
case CHECK_COMMAND_DUEL:
case CHECK_DECK_MASTER_DUEL: {
if (static_cast<irr::gui::IGUICheckBox*>(caller)->isChecked()) {
......@@ -443,7 +422,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
for (int i = 0; i < 2; ++i)
mainGame->chkRules[i]->setEnabled(true);
for (int i = 0; i < 16; ++i) {
if (mainGame->chkRules[i]->isChecked() && i != 3 && i != 11)
if (mainGame->chkRules[i]->isChecked() && i != 3 && i != 9)
for (int i = 0; i < 2; ++i)
mainGame->chkRules[i]->setEnabled(false);
}
......@@ -461,8 +440,8 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
mainGame->chkRules[i]->setEnabled(true);
mainGame->chkRules[10]->setEnabled(true);
for (int i = 0; i < 16; ++i) {
if (mainGame->chkRules[i]->isChecked() && i != 3 && i != 11)
for (int i = 0; i < 2; ++i)
if (mainGame->chkRules[i]->isChecked() && i != 3 && i != 9)
for (int i = 0; i < 1; ++i)
mainGame->chkRules[i]->setEnabled(false);
}
}
......@@ -472,15 +451,15 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
if (static_cast<irr::gui::IGUICheckBox*>(caller)->isChecked()) {
for (int i = 0; i < 3; ++i)
mainGame->chkRules[i]->setEnabled(false);
mainGame->chkRules[9]->setEnabled(false);
mainGame->chkRules[11]->setEnabled(false);
}
else {
for (int i = 0; i < 3; ++i)
mainGame->chkRules[i]->setEnabled(true);
mainGame->chkRules[9]->setEnabled(true);
mainGame->chkRules[11]->setEnabled(true);
for (int i = 0; i < 16; ++i) {
if (mainGame->chkRules[i]->isChecked() && i != 3 && i != 11)
for (int i = 0; i < 2; ++i)
if (mainGame->chkRules[i]->isChecked() && i != 3 && i != 9)
for (int i = 0; i < 1; ++i)
mainGame->chkRules[i]->setEnabled(false);
}
}
......
gframe/network.h
View file @ df559dbc
......@@ -25,13 +25,12 @@ struct HostInfo {
int destiny_draw;
int sealed;
int booster;
int action;
int speed;
int concentration;
int boss;
int city;
int kingdom;
int rose;
int dimension;
int turbo1;
int turbo2;
int doubled;
......
gframe/single_duel.cpp
View file @ df559dbc
......@@ -424,10 +424,6 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
last_replay.WriteInt32(opt, false);
last_replay.Flush();
last_replay.WriteInt32(pdeck[0].main.size() + host_info.rule_count, false);
if(host_info.destiny_draw) {
new_card(pduel, 511004000, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511004000, false);
}
if(host_info.sealed) {
new_card(pduel, 511005092, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511005092, false);
......@@ -436,10 +432,6 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
new_card(pduel, 511005093, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511005093, false);
}
/*if(host_info.speed) {
new_card(pduel, 511004001, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511004001, false);
}*/
if(host_info.concentration) {
new_card(pduel, 511004322, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511004322, false);
......@@ -456,8 +448,9 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
new_card(pduel, 511002621, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511002621, false);
}
if(host_info.rose) {
//needed mode
if(host_info.dimension) {
new_card(pduel, 511600002, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511600002, false);
}
if(host_info.turbo1) {
new_card(pduel, 511002094, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
......@@ -466,11 +459,7 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
if(host_info.turbo2) {
new_card(pduel, 110000000, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(110000000, false);
}/*
if(host_info.doubled) {
new_card(pduel, 511001727, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511001727, false);
}*/
}
if(host_info.command) {
new_card(pduel, 95200000, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(95200000, false);
......@@ -479,9 +468,9 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
new_card(pduel, 300, 0, 0, 0, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(300, false);
}
if(host_info.action) {
new_card(pduel, 95000043, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(95000043, false);
if(host_info.destiny_draw) {
new_card(pduel, 511004000, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511004000, false);
}
for(int32 i = (int32)pdeck[0].main.size() - 1; i >= 0; --i) {
new_card(pduel, pdeck[0].main[i]->first, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
......
gframe/tag_duel.cpp
View file @ df559dbc
......@@ -399,10 +399,6 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
new_card(pduel, pdeck[0].main[i]->first, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(pdeck[0].main[i]->first, false);
}
if(host_info.destiny_draw) {
new_card(pduel, 511004000, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511004000, false);
}
if(host_info.sealed) {
new_card(pduel, 511005092, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511005092, false);
......@@ -411,14 +407,6 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
new_card(pduel, 511005093, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511005093, false);
}
if(host_info.action) {
new_card(pduel, 95000043, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(95000043, false);
}
/*if(host_info.speed) {
new_card(pduel, 511004001, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511004001, false);
}*/
if(host_info.concentration) {
new_card(pduel, 511004322, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511004322, false);
......@@ -435,8 +423,9 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
new_card(pduel, 511002621, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511002621, false);
}
if(host_info.rose) {
//needed mode
if(host_info.dimension) {
new_card(pduel, 511600002, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511600002, false);
}
if(host_info.turbo1) {
new_card(pduel, 511002094, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
......@@ -445,18 +434,18 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
if(host_info.turbo2) {
new_card(pduel, 110000000, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(110000000, false);
}/*
if(host_info.doubled) {
new_card(pduel, 511001727, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511001727, false);
}*/
}
if(host_info.command) {
new_card(pduel, 95200000, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(95200000, false);
}
if(host_info.master) {
new_card(pduel, 51100567, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(51100567, false);
new_card(pduel, 300, 0, 0, 0, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(300, false);
}
if(host_info.destiny_draw) {
new_card(pduel, 511004000, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(511004000, false);
}
last_replay.WriteInt32(pdeck[0].extra.size(), false);
for(int32 i = (int32)pdeck[0].extra.size() - 1; i >= 0; --i) {
......
strings.conf
View file @ df559dbc
......@@ -223,19 +223,19 @@
!system 1129 Tuner-Related
!system 1130 Xyz-Related
!system 1131 Negate Effect
#rule cards
#extra rules
!system 1132 Sealed Duel
!system 1133 Booster Draft Duel
!system 1134 Action Duel
!system 1134 Destiny Draw
!system 1135 Speed Duel
!system 1136 Concentration Duel
!system 1137 Boss Duel
!system 1138 Battle City
!system 1139 Duelist Kingdom
!system 1140 Rose Duel
!system 1141 Turbo Duel (SW)
!system 1140 Dimension Duel
!system 1141 Double Deck Duel
!system 1142 Turbo Duel (SW2)
!system 1143 Double Deck Duel
!system 1143 Turbo Duel (SW)
!system 1144 Command Duel
!system 1145 Deck Masters Duel
#actions
......@@ -424,8 +424,7 @@
!system 1622 [%ls]You lose points
!system 1623 Coin landed on:
!system 1624 Die landed on:
!system 1625 Event Modes
!system 1626 Destiny Draw
!system 1625 Extra Rules
!system 1999 Show anime cards
!system 2046 Enable sound effects
!system 2047 Enable music
......
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