Skip to content

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

Revert "Updated strings, fixed coordinates" 

This reverts commit bdfe3798.
parent bdfe3798
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 66 deletions
gframe/game.cpp
View file @ b0c449da
......@@ -517,10 +517,10 @@ bool Game::Initialize() {
ebDefense = env->addEditBox(L"", rect<s32>(260, 40 + 75 / 6, 340, 60 + 75 / 6), true, wFilter);
ebDefense->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
stStar = env->addStaticText(dataManager.GetSysString(1324), rect<s32>(10, 62 + 100 / 6, 80, 82 + 100 / 6), false, false, wFilter);
ebStar = env->addEditBox(L"", rect<s32>(60, 60 + 100 / 6, 100, 80 + 100 / 6), true, wFilter);
ebStar = env->addEditBox(L"", rect<s32>(60, 60 + 100 / 6, 190, 80 + 100 / 6), true, wFilter);
ebStar->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
stScale = env->addStaticText(dataManager.GetSysString(1336), rect<s32>(101, 62 + 100 / 6, 150, 82 + 100 / 6), false, false, wFilter);
ebScale = env->addEditBox(L"", rect<s32>(150, 60 + 100 / 6, 190, 80 + 100 / 6), true, wFilter);
stScale = env->addStaticText(dataManager.GetSysString(1336), rect<s32>(10, 82 + 125 / 6, 80, 102 + 125 / 6), false, false, wFilter);
ebScale = env->addEditBox(L"", rect<s32>(60, 80 + 125 / 6, 190, 100 + 125 / 6), true, wFilter);
ebScale->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
stSearch = env->addStaticText(dataManager.GetSysString(1325), rect<s32>(205, 62 + 100 / 6, 280, 82 + 100 / 6), false, false, wFilter);
ebCardName = env->addEditBox(L"", rect<s32>(260, 60 + 100 / 6, 390, 80 + 100 / 6), true, wFilter, EDITBOX_KEYWORD);
......@@ -539,23 +539,6 @@ bool Game::Initialize() {
btnCategoryOK = env->addButton(rect<s32>(200, 175, 300, 200), wCategories, BUTTON_CATEGORY_OK, dataManager.GetSysString(1211));
for(int i = 0; i < 32; ++i)
chkCategory[i] = env->addCheckBox(false, recti(10 + (i % 4) * 130, 10 + (i / 4) * 20, 140 + (i % 4) * 130, 30 + (i / 4) * 20), wCategories, -1, dataManager.GetSysString(1100 + i));
btnMarksFilter = env->addButton(rect<s32>(60, 80 + 125 / 6, 190, 100 + 125 / 6), wFilter, BUTTON_MARKS_FILTER, dataManager.GetSysString(1374));
wLinkMarks = env->addWindow(rect<s32>(700, 30, 820, 150), false, dataManager.strBuffer);
wLinkMarks->getCloseButton()->setVisible(false);
wLinkMarks->setDrawTitlebar(false);
wLinkMarks->setDraggable(false);
wLinkMarks->setVisible(false);
btnMarksOK = env->addButton(recti(45, 45, 75, 75), wLinkMarks, BUTTON_MARKERS_OK, dataManager.GetSysString(1211));
btnMark[0] = env->addButton(recti(10, 10, 40, 40), wLinkMarks, -1, L"\x2196");
btnMark[1] = env->addButton(recti(45, 10, 75, 40), wLinkMarks, -1, L"\x2191");
btnMark[2] = env->addButton(recti(80, 10, 110, 40), wLinkMarks, -1, L"\x2197");
btnMark[3] = env->addButton(recti(10, 45, 40, 75), wLinkMarks, -1, L"\x2190");
btnMark[4] = env->addButton(recti(80, 45, 110, 75), wLinkMarks, -1, L"\x2192");
btnMark[5] = env->addButton(recti(10, 80, 40, 110), wLinkMarks, -1, L"\x2199");
btnMark[6] = env->addButton(recti(45, 80, 75, 110), wLinkMarks, -1, L"\x2193");
btnMark[7] = env->addButton(recti(80, 80, 110, 110), wLinkMarks, -1, L"\x2198");
for(int i=0;i<8;i++)
btnMark[i]->setIsPushButton(true);
//replay window
wReplay = env->addWindow(rect<s32>(220, 100, 800, 520), false, dataManager.GetSysString(1202));
wReplay->getCloseButton()->setVisible(false);
......@@ -831,18 +814,6 @@ void Game::LoadExpansionDB() {
} while(FindNextFileW(fh, &fdataw));
FindClose(fh);
}
fh = FindFirstFileW(L"./expansions/live2017/*.cdb", &fdataw);
if (fh != INVALID_HANDLE_VALUE) {
do {
if (!(fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
char fname[780];
BufferIO::EncodeUTF8(fdataw.cFileName, fname);
sprintf(fpath, "./expansions/live2017/%s", fname);
dataManager.LoadDB(fpath);
}
} while (FindNextFileW(fh, &fdataw));
FindClose(fh);
}
#else
DIR * dir;
struct dirent * dirp;
......@@ -1379,18 +1350,16 @@ void Game::OnResize()
cbRace->setRelativePosition(Resize(60, 49, 190, 69));
cbAttribute->setRelativePosition(Resize(60, 26, 190, 46));
cbLimit->setRelativePosition(Resize(260, 3, 390, 23));
ebStar->setRelativePosition(Resize(60, 60 + 100 / 6, 100, 80 + 100 / 6));
ebScale->setRelativePosition(Resize(150, 60 + 100 / 6, 190, 80 + 100 / 6));
ebStar->setRelativePosition(Resize(60, 72, 100, 92));
ebScale->setRelativePosition(Resize(150, 72, 190, 92));
ebAttack->setRelativePosition(Resize(260, 26, 340, 46));
ebDefense->setRelativePosition(Resize(260, 49, 340, 69));
ebCardName->setRelativePosition(Resize(260, 72, 390, 92));
btnEffectFilter->setRelativePosition(Resize(345, 28, 390, 69));
btnStartFilter->setRelativePosition(Resize(260, 96, 390, 118));
btnClearFilter->setRelativePosition(Resize(205, 96, 255, 118));
btnMarksFilter->setRelativePosition(Resize(60, 80 + 125 / 6, 190, 100 + 125 / 6));
wCategories->setRelativePosition(ResizeWin(450, 60, 1000, 270));
wLinkMarks->setRelativePosition(ResizeWin(700, 30, 820, 150));
stBanlist->setRelativePosition(ResizeWin(10, 9, 100, 29));
stDeck->setRelativePosition(ResizeWin(10, 39, 100, 59));
stCategory->setRelativePosition(ResizeWin(10, 5, 70, 25));
......@@ -1399,9 +1368,9 @@ void Game::OnResize()
stRace->setRelativePosition(ResizeWin(10, 51, 70, 71));
stAttack->setRelativePosition(ResizeWin(205, 28, 280, 48));
stDefense->setRelativePosition(ResizeWin(205, 51, 280, 71));
stStar->setRelativePosition(ResizeWin(10, 62 + 100 / 6, 80, 82 + 100 / 6));
stStar->setRelativePosition(ResizeWin(10, 74, 80, 94));
stSearch->setRelativePosition(ResizeWin(205, 74, 280, 94));
stScale->setRelativePosition(ResizeWin(101, 62 + 100 / 6, 150, 82 + 100 / 6));
stScale->setRelativePosition(ResizeWin(101, 74, 150, 94));
btnSideOK->setRelativePosition(Resize(510, 40, 820, 80));
btnDeleteDeck->setRelativePosition(Resize(225, 95, 290, 120));
......
strings.conf
View file @ b0c449da
......@@ -34,8 +34,7 @@
!system 62 Heads effect
!system 63 Tails effect
!system 64 Gemini
!system 65 Use Effect
!system 66 Keep public
!System 65 Use Effect
!system 70 Monster Cards
!system 71 Spell Cards
!system 72 Trap Cards
......@@ -58,7 +57,7 @@
!system 207 Revealing %d card(s):
!system 208 Confirm %d card(s):
!system 209 The card has met the requisites
!system 210 Continue selecting cards?
!system 210 Select if you want continue:
!system 211 Round count:
!system 212 Declared card:
!system 213 Declared type:
......@@ -75,9 +74,9 @@
!system 508 Select the card to Summon
!system 509 Select a Monster to Special Summon
!system 510 Select a card to flip-up
!system 511 Select a card to use as Fusion Material
!system 512 Select a card to use as Synchro Material
!system 513 Select a card to be Xyz Material
!system 511 Select a target to banish
!system 512 Select materials for Synchro Summon
!system 513 Select materials for Xyz Summon
!system 514 Select a card on opponent's side
!system 515 Select a card on your side
!system 516 Select a monster in attack position
......@@ -92,18 +91,18 @@
!system 525 Select defense monster
!system 526 Reveal a card
!system 527 to select the field you want to place the card
!system 528 Select a monster to change its battle position
!system 528 Select a monster to change
!system 529 Select your card
!system 530 Select opponent card
!system 531 Select the highest level monsters for tribute:
!system 532 Select monster to remove Xyz material
!system 532 请选择要取除超量素材的怪兽
!system 550 Select the effect that activates
!system 551 Select the target of the effect
!system 552 Select head or tails
!system 553 Select dice results
!system 554 Declare 1 card type
!system 554 Select a category
!system 555 Select an option
!system 556 Select effect to activate/resolve
!system 556 请选择要发动/处理的效果
!system 560 Select
!system 561 Select the battle position
!system 562 Select Attribute
......@@ -112,8 +111,6 @@
!system 565 Select a number
!system 566 Select the effect to activate
!system 567 Select a Level/Rank
!system 569 Select a Zone to play the card
!system 570 Select a Zone to become unusable
!system 1000 Deck
!system 1001 Hand
!system 1002 Monster Zone
......@@ -155,7 +152,6 @@
!system 1041 Divine-Beast
!system 1042 Creator God
!system 1043 Wyrm
!system 1044 Cyberse
!system 1050 Monster
!system 1051 Spell
!system 1052 Trap
......@@ -164,7 +160,7 @@
!system 1055 Effect
!system 1056 Fusion
!system 1057 Ritual
!system 1058 Trap Monster
!system 1058 Trap Monsters
!system 1059 Spirit
!system 1060 Union
!system 1061 Gemini
......@@ -181,8 +177,6 @@
!system 1072 Toon
!system 1073 Xyz
!system 1074 Pendulum
!system 1075 Special Summon
!system 1076 Link
!system 1080 (N/A)
#GUI
!system 1100 S/T Destroy
......@@ -274,7 +268,7 @@
!system 1233 Cards per Draw:
!system 1234 Host Name:
!system 1235 Password:
!system 1236 Rule
!system 1236 Obsolete Rulings
!system 1237 Time limit：
!system 1240 OCG
!system 1241 TCG
......@@ -289,10 +283,6 @@
!system 1253 Current Spectators:
!system 1254 Select Deck
!system 1255 Ready!
!system 1260 Master Rule 1
!system 1261 Master Rule 2
!system 1262 Master Rule 3
!system 1263 Master Rule 4
!system 1270 Card info
!system 1271 Log
!system 1272 Clear Log
......@@ -308,8 +298,8 @@
!system 1292 Ignore Chain
!system 1293 Always Chain
!system 1294 Normal Chain
!system 1295 Cancel
!system 1296 Finish
!system 1295 Enable sound effects
!system 1296 Enable music
!system 1300 Ban List:
!system 1301 Deck:
!system 1302 Save
......@@ -367,7 +357,6 @@
!system 1371 Attack ↑
!system 1372 Defense ↑
!system 1373 Name ↓
!system 1374 Link Marker
!system 1390 Waiting...
!system 1391 Waiting....
!system 1392 Waiting.....
......@@ -392,7 +381,7 @@
!system 1512 Choice of opponent:[%d]
!system 1600 Activate a card
!system 1601 Set a card
!system 1602 Card control is changed
!system 1602 Change a card
!system 1603 [%ls]Normal Summon...
!system 1604 Normal Summon success
!system 1605 [%ls]Special Summon...
......@@ -417,8 +406,6 @@
!system 1624 Die landed on:
!system 1625 Event Modes
!system 1626 Destiny Draw
!system 2046 Enable sound effects
!system 2047 Enable music
#victory reason
!victory 0x0 Surrendered
!victory 0x1 LP reached 0
......@@ -504,4 +491,4 @@
!counter 0x92 Plasma Counter
!counter 0x93 Sacred Beast Counter
!counter 0x94 Pumpkin Counter
!counter 0x95 Rising Sun Counter
\ No newline at end of file
!counter 0x95 Rising Sun Counter
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