Commit 287f5d7f authored by edo9300's avatar edo9300

Strings update + forbidden types eerror handling

parent 6dd9a52f
...@@ -83,6 +83,8 @@ int DeckManager::CheckDeck(Deck& deck, int lfhash, bool allow_ocg, bool allow_tc ...@@ -83,6 +83,8 @@ int DeckManager::CheckDeck(Deck& deck, int lfhash, bool allow_ocg, bool allow_tc
if(!list) if(!list)
return 0; return 0;
int dc = 0; int dc = 0;
if(TypeCount(deck.main, forbiddentypes) > 0 || TypeCount(deck.extra, forbiddentypes) > 0 || TypeCount(deck.side, forbiddentypes) > 0)
return (DECKERROR_FORBTYPE << 28);
bool speed = mainGame->dInfo.extraval & 0x1; bool speed = mainGame->dInfo.extraval & 0x1;
if(doubled){ if(doubled){
if(speed){ if(speed){
......
...@@ -293,6 +293,10 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) { ...@@ -293,6 +293,10 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
myswprintf(msgbuf, dataManager.GetSysString(1419), code); myswprintf(msgbuf, dataManager.GetSysString(1419), code);
break; break;
} }
case DECKERROR_FORBTYPE: {
myswprintf(msgbuf, dataManager.GetSysString(1421));
break;
}
default: { default: {
myswprintf(msgbuf, dataManager.GetSysString(1406)); myswprintf(msgbuf, dataManager.GetSysString(1406));
break; break;
......
...@@ -233,6 +233,7 @@ public: ...@@ -233,6 +233,7 @@ public:
#define DECKERROR_MAINCOUNT 0x6 #define DECKERROR_MAINCOUNT 0x6
#define DECKERROR_EXTRACOUNT 0x7 #define DECKERROR_EXTRACOUNT 0x7
#define DECKERROR_SIDECOUNT 0x8 #define DECKERROR_SIDECOUNT 0x8
#define DECKERROR_FORBTYPE 0x9
#define MODE_SINGLE 0x0 #define MODE_SINGLE 0x0
#define MODE_MATCH 0x1 #define MODE_MATCH 0x1
......
...@@ -25,17 +25,17 @@ ...@@ -25,17 +25,17 @@
!system 30 Replay, do you want to continue the Battle? !system 30 Replay, do you want to continue the Battle?
!system 31 Do you want to Attack Directly? !system 31 Do you want to Attack Directly?
!system 40 Damage Step !system 40 Damage Step
!system 41 Calculating Damage !system 41 Before Damage Calculation
!system 42 End of Damage Step !system 42 During Damage Calculation
!system 43 At the start of the Damage Step !system 43 After Damage Calculation
!system 44 Damage Step End !system 44 At the end of Damage Step
!system 60 Heads !system 60 Heads
!system 61 Tails !system 61 Tails
!system 62 Heads effect !system 62 Heads effect
!system 63 Tails effect !system 63 Tails effect
!system 64 Gemini !system 64 Gemini
!system 65 Use Effect !system 65 Use Effect
!system 66 Keep public !system 66 Keep revealed
!system 70 Monster Cards !system 70 Monster Cards
!system 71 Spell Cards !system 71 Spell Cards
!system 72 Trap Cards !system 72 Trap Cards
...@@ -43,19 +43,19 @@ ...@@ -43,19 +43,19 @@
!system 81 Entering the End Phase !system 81 Entering the End Phase
!system 90 Normal Summon without tribute(s)? !system 90 Normal Summon without tribute(s)?
!system 91 Use your additional Normal Summon? !system 91 Use your additional Normal Summon?
!system 92 Use Opponent Monster !system 92 Use opponent monster?
!system 93 Do you want to continue to choose the material? !system 93 Do you want to continue to choose the material?
!system 94 Do you want to activate this card's effect now? !system 94 Do you want to activate this card's effect now?
!system 95 Do you want to use [%ls]'s effect? !system 95 Do you want to use "%ls"'s effect?
!system 96 Do you want to use [%ls]'s effect to avoid destruction? !system 96 Do you want to use "%ls"'s effect to avoid destruction?
!system 97 Place [%ls] in the Spell & Trap Zone? !system 97 Place "%ls" in the Spell & Trap Zone?
!system 100 First to go !system 100 First to go
!system 101 Second to go !system 101 Second to go
!system 200 Do you wish to use from [%ls] [%ls]'s effect? !system 200 Do you wish to use from "%ls" "%ls"'s effect?
!system 201 No effect can activated at this moment !system 201 No effect can be activated at this moment
!system 202 Do you want to check the field? !system 202 Do you want to check the field?
!system 203 Chain another card? !system 203 Chain another card?
!system 204 Remove %d [%ls] !system 204 Remove %d "%ls"
!system 205 Please select a sort order !system 205 Please select a sort order
!system 206 Please select the chain sequence !system 206 Please select the chain sequence
!system 207 Revealing %d card(s): !system 207 Revealing %d card(s):
...@@ -94,11 +94,11 @@ ...@@ -94,11 +94,11 @@
!system 524 Select attack monster !system 524 Select attack monster
!system 525 Select defense monster !system 525 Select defense monster
!system 526 Reveal a card !system 526 Reveal a card
!system 527 to select the field you want to place the card !system 527 Select the card to place on the field
!system 528 Select a monster to change its battle position !system 528 Select a monster to change its battle position
!system 529 Select your card !system 529 Select your card
!system 530 Select opponent card !system 530 Select opponent card
!system 531 Select the highest level monsters for tribute: !system 531 Select monsters for Tribute Summon
!system 532 Select a monster to detach Xyz Material !system 532 Select a monster to detach Xyz Material
!system 533 Select a card to use as Link Material !system 533 Select a card to use as Link Material
!system 549 Select an attack target !system 549 Select an attack target
...@@ -117,8 +117,8 @@ ...@@ -117,8 +117,8 @@
!system 565 Declare a number !system 565 Declare a number
!system 566 Select the effect to activate !system 566 Select the effect to activate
!system 567 Declare a Level/Rank !system 567 Declare a Level/Rank
!system 568 Select a card to activate the effect !system 568 Select a card to resolve
!system 569 Select a Zone to play [%ls] !system 569 Select a Zone to play "%ls"
!system 570 Select a Zone to become unusable !system 570 Select a Zone to become unusable
!system 571 Select a Zone to move the card !system 571 Select a Zone to move the card
!system 1000 Deck !system 1000 Deck
...@@ -250,7 +250,10 @@ ...@@ -250,7 +250,10 @@
!system 1157 Attack !system 1157 Attack
!system 1158 View !system 1158 View
!system 1159 S/T Set !system 1159 S/T Set
!system 1160 Activate in Pendulum Zone !system 1160 Put in Pendulum Zone
!system 1161 Do Effect
!system 1162 Reset Effect
!system 1163 Pendulum Summon
#menu #menu
!system 1200 LAN Mode !system 1200 LAN Mode
!system 1201 Puzzle Mode !system 1201 Puzzle Mode
...@@ -389,11 +392,21 @@ ...@@ -389,11 +392,21 @@
!system 1404 Password is incorrect. !system 1404 Password is incorrect.
!system 1405 The host refused the connection. !system 1405 The host refused the connection.
!system 1406 Invalid Deck !system 1406 Invalid Deck
!system 1407 [%ls] not allowed. Check the TCG/OCG card list and check the banlist !system 1407 "%ls" not allowed. Check the TCG/OCG card list and check the banlist
!system 1408 Side decking failed !system 1408 Side decking failed
!system 1409 Waiting for side... !system 1409 Waiting for side...
!system 1410 Side decking error !system 1410 Side decking error
!system 1411 Version mismatch(%X.0%X.%X)。 !system 1411 Version mismatch(%X.0%X.%X).
!system 1412 Unable to resolve host address.
!system 1413 "%ls" is an OCG only card and cannot be used with the current settings.
!system 1414 "%ls" is a TCG only card and cannot be used with the current settings.
!system 1415 "%ls(%d)" cannot be identified by the host.
!system 1416 There are more than 3 copies of "%ls" in your decks.
!system 1417 The size of your Main Deck should be between %d-%d at the moment its size is %d.
!system 1418 The size of your Extra Deck should be not more than %d at the moment its size is %d.
!system 1419 The size of your Side Deck should be not more than %d at the moment its size is %d.
!system 1420 There are Extra Deck only cards in your Main Deck.
!system 1421 There are not allowed card types in your Main Deck
!system 1500 The duel ended. !system 1500 The duel ended.
!system 1501 Replay ended. !system 1501 Replay ended.
!system 1502 Connection has been lost. !system 1502 Connection has been lost.
...@@ -403,26 +416,26 @@ ...@@ -403,26 +416,26 @@
!system 1600 Activate a card !system 1600 Activate a card
!system 1601 Set a card !system 1601 Set a card
!system 1602 Card control is changed !system 1602 Card control is changed
!system 1603 [%ls]Normal Summon... !system 1603 "%ls"Normal Summon...
!system 1604 Normal Summon success !system 1604 Normal Summon success
!system 1605 [%ls]Special Summon... !system 1605 "%ls"Special Summon...
!system 1606 Special Summon success !system 1606 Special Summon success
!system 1607 [%ls]Flip Summon... !system 1607 "%ls"Flip Summon...
!system 1608 Flip Summon success !system 1608 Flip Summon success
!system 1609 [%ls]is activated !system 1609 "%ls"is activated
!system 1610 [%ls](%ls,%d)targeted !system 1610 "%ls"(%ls,%d)targeted
!system 1611 You draw %d card(s) !system 1611 You draw %d card(s)
!system 1612 Opponent draws %d card(s) !system 1612 Opponent draws %d card(s)
!system 1613 Received %d damage !system 1613 Received %d damage
!system 1614 Opponent received %d damage !system 1614 Opponent received %d damage
!system 1615 Increase %d LP !system 1615 Increase %d LP
!system 1616 Opponent increases %d LP !system 1616 Opponent increases %d LP
!system 1617 [%ls] has placed %d [%ls] !system 1617 "%ls" has placed %d "%ls"
!system 1618 [%ls] been removed %d [%ls] !system 1618 "%ls" been removed %d "%ls"
!system 1619 [%ls] Attack [%ls] !system 1619 "%ls" Attacks "%ls"
!system 1620 [%ls] Direct Attack !system 1620 "%ls" Attacks directly
!system 1621 Attack Negated !system 1621 Attack Negated
!system 1622 [%ls]You lose points !system 1622 "%ls"You lose points
!system 1623 Coin landed on: !system 1623 Coin landed on:
!system 1624 Die landed on: !system 1624 Die landed on:
!system 1625 Extra Rules !system 1625 Extra Rules
......
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