diff --git a/Content/BP/female/BP_Female.uasset b/Content/BP/female/BP_Female.uasset index 9a6913f..e23046a 100644 Binary files a/Content/BP/female/BP_Female.uasset and b/Content/BP/female/BP_Female.uasset differ diff --git a/Content/BP/gameMode/BP_WBIFGameModeBase.uasset b/Content/BP/gameMode/BP_WBIFGameModeBase.uasset index 9259449..4e17ccf 100644 Binary files a/Content/BP/gameMode/BP_WBIFGameModeBase.uasset and b/Content/BP/gameMode/BP_WBIFGameModeBase.uasset differ diff --git a/Content/BP/instance/GameInstanceWBIF.uasset b/Content/BP/instance/GameInstanceWBIF.uasset index 36518a0..292d897 100644 Binary files a/Content/BP/instance/GameInstanceWBIF.uasset and b/Content/BP/instance/GameInstanceWBIF.uasset differ diff --git a/Content/maps/test_map.umap b/Content/maps/test_map.umap index 3a9b3f9..0a8979e 100644 Binary files a/Content/maps/test_map.umap and b/Content/maps/test_map.umap differ diff --git a/Content/ui/gameWidget/gameWidget.uasset b/Content/ui/gameWidget/gameWidget.uasset index 8cad668..afa332c 100644 Binary files a/Content/ui/gameWidget/gameWidget.uasset and b/Content/ui/gameWidget/gameWidget.uasset differ diff --git a/Source/WBIF/Private/WBIFGameInstance.cpp b/Source/WBIF/Private/WBIFGameInstance.cpp index 587b818..ed7df37 100644 --- a/Source/WBIF/Private/WBIFGameInstance.cpp +++ b/Source/WBIF/Private/WBIFGameInstance.cpp @@ -2,23 +2,178 @@ #include "WBIFGameInstance.h" +#include "Math/UnrealMathUtility.h" + +/* + * setters + */ void UWBIFGameInstance::setCurrentStamina(float curStamina) { CurrentStamina = curStamina; } -void UWBIFGameInstance::setMaxStaminaStamina(float maximumStamina) +void UWBIFGameInstance::setMaxStamina(float maximumStamina) { MaxStamina = maximumStamina; } +void UWBIFGameInstance::setCurrentMood(float curMood) +{ + CurrentMood = curMood; +} + +void UWBIFGameInstance::setMaxMood(float maximumMood) +{ + MaxMood = maximumMood; +} + +void UWBIFGameInstance::setMaxMortgage(float maximumMortgage) +{ + MaxMortgage = maximumMortgage; +} + +void UWBIFGameInstance::setCurrentMortgage(float CurMortgage) +{ + CurrentMortgage = CurMortgage; +} + +void UWBIFGameInstance::setLimitPerOneMonth(float LimPerOneMonth) +{ + LimitPerOneMonth = LimPerOneMonth; +} + +void UWBIFGameInstance::setPercent(float percnt) +{ + Percent = percnt; +} + +void UWBIFGameInstance::setCalendarDay(int NumDay) +{ + CalendarDay = NumDay; +} + +void UWBIFGameInstance::setRedDay(int NumRedDay) +{ + RedDay = NumRedDay; +} + +void UWBIFGameInstance::setFemaleDay(int NumFemDay) +{ + FemaleDay = NumFemDay; +} + +/* + * getters + */ + + +float UWBIFGameInstance::getMaxMood() +{ + return MaxMood; +} + +float UWBIFGameInstance::getCurrentMood() +{ + return CurrentMood; +} + float UWBIFGameInstance::getCurrentStamina() { return CurrentStamina; } - float UWBIFGameInstance::getMaxStamina() { return MaxStamina; } + +float UWBIFGameInstance::getMaxMortgage() +{ + return MaxMortgage; +} + +float UWBIFGameInstance::getCurrentMortgage() +{ + return CurrentMortgage; +} + +float UWBIFGameInstance::getLimitPerOneMonth() +{ + return LimitPerOneMonth; +} + +float UWBIFGameInstance::getPercent() +{ + return Percent; +} + +int UWBIFGameInstance::getCalendarDay() +{ + return CalendarDay; +} + +int UWBIFGameInstance::getRedDay() +{ + return RedDay; +} + +int UWBIFGameInstance::getFemaleDay() +{ + return FemaleDay; +} + + +//==================================== + + +void UWBIFGameInstance::CommitPayment(float Payment) +{ + LimitPerOneMonth -= Payment; +} + +void UWBIFGameInstance::addPercentMortgage() +{ + MaxMortgage += (MaxMortgage * Percent); +} + +void UWBIFGameInstance::plusDayTocalendarDay() +{ + CalendarDay++; +} + +void UWBIFGameInstance::generateNumberRedDays() +{ + RedDay = FMath::RandRange(3, 5); +} + +void UWBIFGameInstance::generateFemaleDays() +{ + + FemaleDay = FMath::RandRange(28, 35); +} + +int UWBIFGameInstance::minusRedDay() +{ + RedDay--; + return RedDay; +} + +int UWBIFGameInstance::minusFemaleDay() +{ + FemaleDay--; + return FemaleDay; +} + +bool UWBIFGameInstance::isLastDayMonth() +{ + if (CalendarDay % 30 == 0) + { + return true; + } + else + { + return false; + } +} + + diff --git a/Source/WBIF/Public/WBIFGameInstance.h b/Source/WBIF/Public/WBIFGameInstance.h index 9a22a0c..2b093f5 100644 --- a/Source/WBIF/Public/WBIFGameInstance.h +++ b/Source/WBIF/Public/WBIFGameInstance.h @@ -19,19 +19,111 @@ public: protected: private: - /* - * stamina player - */ - float CurrentStamina; - float MaxStamina; + /* + * stamina player + */ + float CurrentStamina; + float MaxStamina; + + /* + * mood female + */ + float MaxMood; + float CurrentMood; + + /* + * Mortgage + */ + float MaxMortgage; + float CurrentMortgage; + float LimitPerOneMonth; + float Percent; + + /* + * Days + */ + int CalendarDay; + int RedDay; + int FemaleDay; + public: + /* + * setters + */ UFUNCTION(BlueprintCallable, Category = "stamina player") void setCurrentStamina(float curStamina); UFUNCTION(BlueprintCallable, Category = "stamina player") - void setMaxStaminaStamina(float maximumStamina); + void setMaxStamina(float maximumStamina); + + UFUNCTION(BlueprintCallable, Category = "Female") + void setCurrentMood(float curMood); + UFUNCTION(BlueprintCallable, Category = "Female") + void setMaxMood(float maximumMood); + + UFUNCTION(BlueprintCallable, Category = "Mortgage") + void setMaxMortgage(float maximumMortgage); + UFUNCTION(BlueprintCallable, Category = "Mortgage") + void setCurrentMortgage(float CurMortgage); + UFUNCTION(BlueprintCallable, Category = "Mortgage") + void setLimitPerOneMonth(float LimPerOneMonth); + UFUNCTION(BlueprintCallable, Category = "Mortgage") + void setPercent(float percnt); + + UFUNCTION(BlueprintCallable, Category = "Days") + void setCalendarDay(int NumDay); + UFUNCTION(BlueprintCallable, Category = "Days") + void setRedDay(int NumRedDay); + UFUNCTION(BlueprintCallable, Category = "Days") + void setFemaleDay(int NumFemDay); + + + + + /* + * getters + */ UFUNCTION(BlueprintPure, Category = "stamina player") float getCurrentStamina(); UFUNCTION(BlueprintPure, Category = "stamina player") float getMaxStamina(); + + UFUNCTION(BlueprintPure, Category = "Female") + float getMaxMood(); + UFUNCTION(BlueprintPure, Category = "Female") + float getCurrentMood(); + + UFUNCTION(BlueprintPure, Category = "Mortgage") + float getMaxMortgage(); + UFUNCTION(BlueprintPure, Category = "Mortgage") + float getCurrentMortgage(); + UFUNCTION(BlueprintPure, Category = "Mortgage") + float getLimitPerOneMonth(); + UFUNCTION(BlueprintPure, Category = "Mortgage") + float getPercent(); + + UFUNCTION(BlueprintPure, Category = "Days") + int getCalendarDay(); + UFUNCTION(BlueprintPure, Category = "Days") + int getRedDay(); + UFUNCTION(BlueprintPure, Category = "Days") + int getFemaleDay(); + + //============================================== + UFUNCTION(BlueprintCallable, Category = "Mortgage") + void CommitPayment(float Payment); + UFUNCTION(BlueprintCallable, Category = "Mortgage") + void addPercentMortgage(); + UFUNCTION(BlueprintCallable, Category = "Days") + void plusDayTocalendarDay(); + UFUNCTION(BlueprintCallable, Category = "Days") + void generateNumberRedDays(); + UFUNCTION(BlueprintCallable, Category = "Days") + void generateFemaleDays(); + UFUNCTION(BlueprintCallable, Category = "Days") + int minusRedDay(); + UFUNCTION(BlueprintCallable, Category = "Days") + int minusFemaleDay(); + UFUNCTION(BlueprintPure, Category = "Days") + bool isLastDayMonth(); };