|
@@ -363,7 +363,7 @@ bool FluidContainerItemSkill::use(
|
|
usedConfig = invalidUseConfig;
|
|
usedConfig = invalidUseConfig;
|
|
invalid = true;
|
|
invalid = true;
|
|
}
|
|
}
|
|
- else if (usedItem->getAmount() + 1000 <= usedItemType->getMaxFluidAmount())
|
|
|
|
|
|
+ else if (usedItem->getAmount() + 1000 > usedItemType->getMaxFluidAmount())
|
|
{
|
|
{
|
|
usedConfig = invalidUseConfig;
|
|
usedConfig = invalidUseConfig;
|
|
invalid = true;
|
|
invalid = true;
|
|
@@ -511,7 +511,8 @@ void FluidContainerItemSkillFactory::toJson(FluidContainerItemSkill* zObject,
|
|
JSONObjectValidationBuilder* FluidContainerItemSkillFactory::addToValidator(
|
|
JSONObjectValidationBuilder* FluidContainerItemSkillFactory::addToValidator(
|
|
JSONObjectValidationBuilder* builder) const
|
|
JSONObjectValidationBuilder* builder) const
|
|
{
|
|
{
|
|
- return builder->withRequiredNumber("invalidUseStaminaCost")
|
|
|
|
|
|
+ return ItemSkillFactoryBase::addToValidator(builder)
|
|
|
|
+ ->withRequiredNumber("invalidUseStaminaCost")
|
|
->whichIsGreaterOrEqual(0.0)
|
|
->whichIsGreaterOrEqual(0.0)
|
|
->withDefault(0.5)
|
|
->withDefault(0.5)
|
|
->finishNumber()
|
|
->finishNumber()
|
|
@@ -519,7 +520,7 @@ JSONObjectValidationBuilder* FluidContainerItemSkillFactory::addToValidator(
|
|
->whichIsGreaterOrEqual(0.0)
|
|
->whichIsGreaterOrEqual(0.0)
|
|
->withDefault(0.9)
|
|
->withDefault(0.9)
|
|
->finishNumber()
|
|
->finishNumber()
|
|
- ->withRequiredNumber("sinvalidUseStaminaCostDeviderPerLevel")
|
|
|
|
|
|
+ ->withRequiredNumber("invalidUseStaminaCostDeviderPerLevel")
|
|
->whichIsGreaterOrEqual(0.0)
|
|
->whichIsGreaterOrEqual(0.0)
|
|
->withDefault(0.1)
|
|
->withDefault(0.1)
|
|
->finishNumber()
|
|
->finishNumber()
|