diff --git a/CMakeLists.txt b/CMakeLists.txt index c5d8b64..9c3a6b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ if ( MSVC ) endif() set (VERSION_MAJOR 1) -set (VERSION_MINOR 2) +set (VERSION_MINOR 3) include(GNUInstallDirs) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY diff --git a/src/TopTeamBedrijfssimulaties/Starters/Starters.cpp b/src/TopTeamBedrijfssimulaties/Starters/Starters.cpp index 3da23ad..243cced 100644 --- a/src/TopTeamBedrijfssimulaties/Starters/Starters.cpp +++ b/src/TopTeamBedrijfssimulaties/Starters/Starters.cpp @@ -577,20 +577,20 @@ int Starters_c::AdditionalOrdersQualityStandard(unsigned int budgetQuality) int Starters_c::AdditionalOrdersQualityLuxe(unsigned int budgetQuality) { - if (budgetQuality == 50000) + if (budgetQuality == 5000) return 500; - if (budgetQuality == 60000) + if (budgetQuality == 6000) return 600; - if (budgetQuality == 70000) + if (budgetQuality == 7000) return 700; - if (budgetQuality == 80000) + if (budgetQuality == 8000) return 800; - if (budgetQuality == 90000) + if (budgetQuality == 9000) return 900; - if (budgetQuality == 100000) + if (budgetQuality == 10000) return 1000; - if (budgetQuality >= 5000 && budgetQuality <= 100000) + if (budgetQuality >= 5000 && budgetQuality <= 10000) return budgetQuality * 1000 / 100000; debugErrorln("AdditionalOrdersQualityLuxe: budgetQuality " + std::to_string(budgetQuality) + " is not in range"); diff --git a/src/TopTeamBedrijfssimulaties/Starters/Starters.hpp b/src/TopTeamBedrijfssimulaties/Starters/Starters.hpp index bfc4ce3..99be729 100644 --- a/src/TopTeamBedrijfssimulaties/Starters/Starters.hpp +++ b/src/TopTeamBedrijfssimulaties/Starters/Starters.hpp @@ -119,7 +119,7 @@ protected: int B3 = 0; int B4 = 0; - int C1 = 200; + int C1 = 0; int C2 = 0; int C3 = 0; int C4 = 0; @@ -131,8 +131,8 @@ protected: int D2 = 0; int D3 = 0; int D4 = 0; - int D5 = 0; - int D6 = 0; + float D5 = 0; + float D6 = 0; int D7 = 0; int D8 = 0; int D9 = 0; diff --git a/src/main.cpp b/src/main.cpp index 1873aeb..0267732 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) Starters_c gameSession1(Starters_c::MachineStandard::Standard, 3, 2000, 2000, 2000, 40, 40, 6000, 45000); Starters_c gameSession2(Starters_c::MachineStandard::Luxe, 1000, 1000, 105, 25, 9000, 25000); Starters_c gameSession3(Starters_c::MachineStandard::Luxe, 1000, 1000, 1000, 105, 25, 9000, 25000); - Starters_c test(Starters_c::MachineStandard::Luxe, 1000, 1000, 1000, 105, 50, 9000, 25000); + Starters_c test(Starters_c::MachineStandard::Luxe, 1000, 1000, 0, 105, 25, 10000, 25000); debugln("Game Session 1: " << gameSession1.calculate()); debugln("Game Session 2: " << gameSession2.calculate());