diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e6188a3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +image +generate diff --git a/Bez_nadeje.png b/Bez_nadeje.png deleted file mode 100644 index 799b6fa..0000000 Binary files a/Bez_nadeje.png and /dev/null differ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e59b0f7 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ + +image: image.cpp + g++ image.cpp -o image -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_imgcodecs + +generate: generate.cpp + g++ generate.cpp -o generate + +folders: cards/factions.json + for jmeno in $$(cat cards/factions); do mkdir cards/$$jmeno && mkdir cards/$$jmeno; done diff --git a/bruhmbor b/bruhmbor deleted file mode 100644 index 3eafe91..0000000 --- a/bruhmbor +++ /dev/null @@ -1 +0,0 @@ -bruh diff --git a/cards/factions.json b/cards/factions.json index 89c9b94..46db95b 100644 --- a/cards/factions.json +++ b/cards/factions.json @@ -1,5 +1,4 @@ [ - "universal", "northern-kingdoms", "monsters", "nilfgaard", diff --git a/cards/template.json b/cards/template.json index a59d053..c19def1 100644 --- a/cards/template.json +++ b/cards/template.json @@ -4,7 +4,5 @@ "faction": "My Ass", "line": "balls", "power": 0, - "traits": [ - - ] + "traits": [] } diff --git a/cards/universal/images/test.png b/cards/universal/images/test.png deleted file mode 100644 index c5946fe..0000000 Binary files a/cards/universal/images/test.png and /dev/null differ diff --git a/cards/universal/test.json b/cards/universal/test.json deleted file mode 100644 index feed130..0000000 --- a/cards/universal/test.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "display": "Tester", - "faction": "universal", - "line": "front", - "name": "test", - "power": 0, - "traits": [ - "spy", - "double" - ] -} diff --git a/cards/universal/test.png b/cards/universal/test.png deleted file mode 100644 index 799b6fa..0000000 Binary files a/cards/universal/test.png and /dev/null differ diff --git a/folders.cpp b/folders.cpp deleted file mode 100644 index dac83c8..0000000 --- a/folders.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include -#include -#include -#include -#include - -using nlohmann::json; -using std::string; - -int main() { - std::ifstream f1("cards/template.json"); - json data = json::parse(f1); - - std::ifstream f2("cards/traits.json"); - json traits = json::parse(f2); - - - std::ifstream f3("cards/factions.json"); - json factions = json::parse(f3); - - std::ifstream f4("cards/lines.json"); - json lines = json::parse(f4); - - for(auto f : factions) { - string command = "mkdir cards/" + string(f) + "/images"; - std::system(command.c_str()); - } - - //std::ofstream out("cards/"+factions[faction]+"/"+name+".json"); - return 0; -} diff --git a/generate b/generate deleted file mode 100755 index 4b84457..0000000 Binary files a/generate and /dev/null differ diff --git a/generate.cpp b/generate.cpp index 16ecfca..b0a98a4 100644 --- a/generate.cpp +++ b/generate.cpp @@ -1,51 +1,53 @@ #include #include #include -#include #include using nlohmann::json; using std::string; -int main() { - std::ifstream f1("cards/template.json"); - json data = json::parse(f1); - - std::ifstream f2("cards/traits.json"); - json traits = json::parse(f2); - - - std::ifstream f3("cards/factions.json"); - json factions = json::parse(f3); - - std::ifstream f4("cards/lines.json"); - json lines = json::parse(f4); - - std::cout << "Name: "; - string name; std::cin >> name; data["name"] = name; - - std::cout << "Display name: "; - std::cin.ignore(); - string display; std::getline(std::cin, display); data["display"] = display; - - std::cout << "Faction (0:Universal,1:SK,2:M,3:N,4:S): "; - int faction; std::cin >> faction; data["faction"] = factions[faction]; - - std::cout << "Line (0:front, 1:middle, 2:back): "; - int line; std::cin >> line; data["line"] = lines[line]; - - std::cout << "Power: "; - int power; std::cin >> power; data["power"] = power; - - std::cout << "Traits (0:End,1:Spy,2:Double,3:Boost,4:Call-to-arms,5:Horn,6:Revive,7:Destroy): "; - int trait = -1; - while(trait != 0) { - if(trait != -1) data["traits"].push_back(traits[trait-1]); - std::cin >> trait; - } - - std::ofstream out("cards/"+string(factions[faction])+"/"+name+".json"); - - out << data.dump(2) << std::endl; - return 0; +string get(json j, string name) { + std::cout << name << " ("; + for(int i = 0; i < j.size(); ++i) + std::cout << i << ':' << j[i] << ' '; + std::cout << ") : "; + int index; std::cin >> index; + if(index < 0 || index >= j.size()) + return ""; + return j[index]; +} + +int main() { + std::ifstream f1("cards/template.json"); + json data = json::parse(f1); + + std::ifstream f2("cards/traits.json"); + json traits = json::parse(f2); + + std::ifstream f3("cards/factions.json"); + json factions = json::parse(f3); + + std::ifstream f4("cards/lines.json"); + json lines = json::parse(f4); + + std::cout << "Name: "; + std::cin.ignore(); + string name; std::getline(std::cin, name); + data["name"] = name; + + data["faction"] = get(factions, "Faction"); + + data["line"] = get(lines, "Line"); + + std::cout << "Power: "; + int power; std::cin >> power; data["power"] = power; + + for(string trait = get(traits, "Trait"); trait != ""; trait = get(traits, "Trait")) + if(trait != "") + data["traits"].push_back(trait); + + std::ofstream out("cards/"+string(data["faction"])+"/"+name+".json"); + + out << data.dump(2) << std::endl; + return 0; } diff --git a/icom b/icom deleted file mode 100755 index f7c75f3..0000000 --- a/icom +++ /dev/null @@ -1 +0,0 @@ -g++ image.cpp -o image -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_imgcodecs diff --git a/image b/image deleted file mode 100755 index 5d076fc..0000000 Binary files a/image and /dev/null differ diff --git a/image.cpp b/image.cpp index 3bcb278..b6dcee1 100644 --- a/image.cpp +++ b/image.cpp @@ -19,73 +19,73 @@ using std::string; Mat source_image = Mat::zeros(Size(H,W),CV_8UC1); void render(int i, int j, int y_s, int x_s, Mat *img) { - if(i >= y_s && i <= y_s+R-1 && j >= x_s && j <= x_s+R-1) { - source_image.at(i,j)=img->at(i-y_s,j-x_s); - } + if(i >= y_s && i <= y_s+R-1 && j >= x_s && j <= x_s+R-1) { + source_image.at(i,j)=img->at(i-y_s,j-x_s); + } } int main(int argc, char** argv) { - // FACTION - int fac; - if(argc <= 1) { - std::cout << "0:U,1:SK,2:M,3:N,4:S"; - std::cin >> fac; - } - else fac = std::atoi(argv[1]); + // FACTION + int fac; + if(argc <= 1) { + std::cout << "0:U,1:SK,2:M,3:N,4:S"; + std::cin >> fac; + } + else fac = std::atoi(argv[1]); - std::ifstream ff("cards/factions.json"); - json factions = json::parse(ff); - string faction = factions[fac]; - - // NAME - string name; - if(argc <= 2) std::cin >> name; - else name = argv[2]; - std::ifstream f("cards/"+faction+"/"+name+".json"); - json data = json::parse(f); + std::ifstream ff("cards/factions.json"); + json factions = json::parse(ff); + string faction = factions[fac]; + + // NAME + string name; + if(argc <= 2) std::cin >> name; + else name = argv[2]; + std::ifstream f("cards/"+faction+"/"+name+".json"); + json data = json::parse(f); - // LOAD IMAGES - Mat i_look = imread("cards/"+faction+"/images/"+name+".png",IMREAD_GRAYSCALE); - Mat i_faction = imread("cards/images/factions/"+faction+".png",IMREAD_GRAYSCALE); - Mat i_line = imread("cards/images/lines/"+string(data["line"])+".png",IMREAD_GRAYSCALE); - - // RENDER IMAGES - std::vector i_traits; - for(auto trait : data["traits"]) { - i_traits.push_back(imread("cards/images/traits/"+string(trait)+".png",IMREAD_GRAYSCALE)); - } + // LOAD IMAGES + Mat i_look = imread("cards/"+faction+"/images/"+name+".png",IMREAD_GRAYSCALE); + Mat i_faction = imread("cards/images/factions/"+faction+".png",IMREAD_GRAYSCALE); + Mat i_line = imread("cards/images/lines/"+string(data["line"])+".png",IMREAD_GRAYSCALE); + + // RENDER IMAGES + std::vector i_traits; + for(auto trait : data["traits"]) { + i_traits.push_back(imread("cards/images/traits/"+string(trait)+".png",IMREAD_GRAYSCALE)); + } - for(int i=0;i(i,j)=i_look.at(i,j); - - // RENDER POWER AND TRAITS - string bruh = std::to_string((int)data["power"]); - for(int i=0;i(i,j)=i_look.at(i,j); + + // RENDER POWER AND TRAITS + string bruh = std::to_string((int)data["power"]); + for(int i=0;i