diff --git a/Console/.vs/ConsoleApplication1/v15/.suo b/Console/.vs/ConsoleApplication1/v15/.suo index 30f9619..a6c9eec 100644 Binary files a/Console/.vs/ConsoleApplication1/v15/.suo and b/Console/.vs/ConsoleApplication1/v15/.suo differ diff --git a/Console/.vs/ConsoleApplication1/v15/Browse.VC.db b/Console/.vs/ConsoleApplication1/v15/Browse.VC.db index 0182933..6c643bb 100644 Binary files a/Console/.vs/ConsoleApplication1/v15/Browse.VC.db and b/Console/.vs/ConsoleApplication1/v15/Browse.VC.db differ diff --git a/Console/.vs/ConsoleApplication1/v15/ipch/bb9e0dc096a16d4d.ipch b/Console/.vs/ConsoleApplication1/v15/ipch/bb9e0dc096a16d4d.ipch index 5a696a8..2b195ab 100644 Binary files a/Console/.vs/ConsoleApplication1/v15/ipch/bb9e0dc096a16d4d.ipch and b/Console/.vs/ConsoleApplication1/v15/ipch/bb9e0dc096a16d4d.ipch differ diff --git a/Console/ConsoleApplication1/ConsoleApplication1.cpp b/Console/ConsoleApplication1/ConsoleApplication1.cpp index 53795a6..0fa5194 100644 --- a/Console/ConsoleApplication1/ConsoleApplication1.cpp +++ b/Console/ConsoleApplication1/ConsoleApplication1.cpp @@ -144,7 +144,7 @@ int main() tab[i][j].kolor = "zolty"; tab[i][j].kwiat = "dzwoneczki"; tab[i][j].lisc = "sredni"; - tab[i][j].wod_check = 1; + tab[i][j].wod_check = 2; tab[i][j].naw_check = 6; } else diff --git a/Console/ConsoleApplication1/pch.cpp b/Console/ConsoleApplication1/pch.cpp index 3263c71..aa83836 100644 --- a/Console/ConsoleApplication1/pch.cpp +++ b/Console/ConsoleApplication1/pch.cpp @@ -16,7 +16,7 @@ using namespace std; extern bool gra = true; char mapa[25][25]; -int pozycjaX = 1, pozycjaY = 1, ilosc_roslin = 0, ilosc_plonow = 0, ilosc_trupow = 0, paliwo = 0, konrolka = 0, h; +int pozycjaX = 1, pozycjaY = 1, ilosc_roslin = 0, ilosc_plonow = 0, ilosc_trupow = 0, paliwo = 0, konrolka = 0, h , pog; clock_t start, stop; double czas; @@ -2414,7 +2414,7 @@ void updateMapa() czas = (stop - start) / (double)CLOCKS_PER_SEC; SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), 0x00F); cout << (int)czas << '\n' << ilosc_roslin << " roslin" << '\n' << ilosc_trupow << " martwych roslin" << '\n' << ilosc_plonow << " planow" << '\n' << paliwo << " zuzyte paliwo "; - cout << glowna._droga << ' ' << h << ' ' << scierzka[0].waga << ' ' << scierzka[1].waga << ' ' << scierzka[2].waga << ' ' << scierzka[3].waga << ' ' << scierzka[4].waga << ' ' << scierzka[5].waga << ' ' << scierzka[6].waga << ' ' << scierzka[7].waga << ' ' << scierzka[8].waga << ' ' << scierzka[9].waga << ' ' << scierzka[10].waga << ' ' << scierzka[11].waga << ' ' << scierzka[12].waga << ' ' << scierzka[13].waga << ' ' << scierzka[14].waga << ' ' << scierzka[15].waga << ' ' << sciezka_temp.numer << ' ' << sciezka_temp.waga; + cout << pog; } //////////////////////////////////////////////////////////////////////////////// @@ -2432,8 +2432,14 @@ void Odswiez(void* data) void Chodz(void* data) { + int x; do { + x = rand() % 10; + if (x < 3) + { + pogoda(); + } idz(); } while (gra != FALSE); _endthread(); @@ -2613,4 +2619,61 @@ void dzialanie(char klikniecie) } +void pogoda() +{ + int i ,j; + pog = rand() % 3; + + for (i = 2; i <= 23; i++) + { + for (j = 2; j < 23; j++) + { + if (i != 2 && i != 4 && i != 7 && i != 10 && i != 13 && i != 16 && i != 19 && i != 22 && j != 12) + { + if (tab[i][j].rodzaj == 1) + { + tab[i][j].wod_check = 3; + tab[i][j].naw_check = 4; + } + else if (tab[i][j].rodzaj == 2) + { + tab[i][j].wod_check = 5; + tab[i][j].naw_check = 2; + } + else if (tab[i][j].rodzaj == 3) + { + tab[i][j].wod_check = 2; + tab[i][j].naw_check = 6; + } + else + { + tab[i][j].wod_check = 10; + tab[i][j].naw_check = 10; + } + } + } + } + + for (i = 2; i <= 23; i++) + { + for (j = 2; j < 23; j++) + { + if (i != 2 && i != 4 && i != 7 && i != 10 && i != 13 && i != 16 && i != 19 && i != 22 && j != 12) + { + if (pog == 1) //zbyt słonecznie + { + tab[i][j].wod_check = tab[i][j].wod_check + 3; + tab[i][j].naw_check--; + } + + else if (pog == 2) //burza + { + tab[i][j].wod_check--; + tab[i][j].naw_check = tab[i][j].naw_check +3; + } + } + } + } + +} ////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Console/ConsoleApplication1/pch.h b/Console/ConsoleApplication1/pch.h index 0a7f512..00210c6 100644 --- a/Console/ConsoleApplication1/pch.h +++ b/Console/ConsoleApplication1/pch.h @@ -54,7 +54,7 @@ struct roslina }roslina; extern char mapa[25][25]; -extern int pozycjaX, pozycjaY, ilosc_roslin, ilosc_plonow, ilosc_trupow, paliwo, konrolka, h; +extern int pozycjaX, pozycjaY, ilosc_roslin, ilosc_plonow, ilosc_trupow, paliwo, konrolka, h, pog; extern clock_t start, stop; extern double czas; @@ -78,6 +78,7 @@ void Odswiez(void* data); void Chodz(void* data); void ShowConsoleCursor(bool showFlag); void dzialanie(char klikniecie); +void pogoda(); #endif _PCH_H diff --git a/Console/ConsoleApplication1/x64/Debug/ConsoleA.7F6D3ECE.tlog/link.read.1.tlog b/Console/ConsoleApplication1/x64/Debug/ConsoleA.7F6D3ECE.tlog/link.read.1.tlog index af6c5a4..c031c9f 100644 Binary files a/Console/ConsoleApplication1/x64/Debug/ConsoleA.7F6D3ECE.tlog/link.read.1.tlog and b/Console/ConsoleApplication1/x64/Debug/ConsoleA.7F6D3ECE.tlog/link.read.1.tlog differ diff --git a/Console/ConsoleApplication1/x64/Debug/ConsoleApplication1.obj b/Console/ConsoleApplication1/x64/Debug/ConsoleApplication1.obj index 82b6b5a..692c46b 100644 Binary files a/Console/ConsoleApplication1/x64/Debug/ConsoleApplication1.obj and b/Console/ConsoleApplication1/x64/Debug/ConsoleApplication1.obj differ diff --git a/Console/ConsoleApplication1/x64/Debug/ConsoleApplication1.pch b/Console/ConsoleApplication1/x64/Debug/ConsoleApplication1.pch index 814e7d1..4efeae6 100644 Binary files a/Console/ConsoleApplication1/x64/Debug/ConsoleApplication1.pch and b/Console/ConsoleApplication1/x64/Debug/ConsoleApplication1.pch differ diff --git a/Console/ConsoleApplication1/x64/Debug/pch.obj b/Console/ConsoleApplication1/x64/Debug/pch.obj index 7fd0135..468c5dc 100644 Binary files a/Console/ConsoleApplication1/x64/Debug/pch.obj and b/Console/ConsoleApplication1/x64/Debug/pch.obj differ diff --git a/Console/ConsoleApplication1/x64/Debug/vc141.idb b/Console/ConsoleApplication1/x64/Debug/vc141.idb index 3290f2a..90afa69 100644 Binary files a/Console/ConsoleApplication1/x64/Debug/vc141.idb and b/Console/ConsoleApplication1/x64/Debug/vc141.idb differ diff --git a/Console/ConsoleApplication1/x64/Debug/vc141.pdb b/Console/ConsoleApplication1/x64/Debug/vc141.pdb index f53f5e6..7884311 100644 Binary files a/Console/ConsoleApplication1/x64/Debug/vc141.pdb and b/Console/ConsoleApplication1/x64/Debug/vc141.pdb differ diff --git a/Console/x64/Debug/ConsoleApplication1.exe b/Console/x64/Debug/ConsoleApplication1.exe index 90209dc..a7d5a55 100644 Binary files a/Console/x64/Debug/ConsoleApplication1.exe and b/Console/x64/Debug/ConsoleApplication1.exe differ diff --git a/Console/x64/Debug/ConsoleApplication1.ilk b/Console/x64/Debug/ConsoleApplication1.ilk index 36b2117..b21a6ec 100644 Binary files a/Console/x64/Debug/ConsoleApplication1.ilk and b/Console/x64/Debug/ConsoleApplication1.ilk differ diff --git a/Console/x64/Debug/ConsoleApplication1.pdb b/Console/x64/Debug/ConsoleApplication1.pdb index 98f4def..0eec7ae 100644 Binary files a/Console/x64/Debug/ConsoleApplication1.pdb and b/Console/x64/Debug/ConsoleApplication1.pdb differ