Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes tools to use gt5u style damage system #1

Merged
merged 2 commits into from
Jun 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -340,31 +340,33 @@ public int damageItem(ItemStack stack, int vanillaDamage, boolean allowPartial,
energyAmount = (int) discharged;
vanillaDamage = energyAmount / ConfigHolder.energyUsageMultiplier;
if (energyAmount % ConfigHolder.energyUsageMultiplier != 0)
++vanillaDamage;
}
else {
++vanillaDamage;
} else {
// Can't do the operation
return 0;
}
}
capability.discharge(energyAmount, capability.getTier(), true, false, simulate);
}
T toolMetaItem = getItem(stack);
if (toolMetaItem == null) {
return 0;
}
IToolStats toolStats = toolMetaItem.getToolStats();
if (!toolStats.isUsingDurability(stack)) {
return vanillaDamage;
}
int itemDamage = getItemDamage(stack);
int maxDamage = getMaxItemDamage(stack);
int damageRemaining = maxDamage - itemDamage;
int newDamageValue = itemDamage + calculateToolDamage(stack, itemRand, vanillaDamage);
if (!simulate && !setInternalDamage(stack, newDamageValue)) {
GTUtility.setItem(stack, toolStats.getBrokenStack(stack));
if ( capability == null || (capability.getCharge() <= 0 || GTUtility.getRandomIntXSTR(100) <= 4)) {
T toolMetaItem = getItem(stack);
if (toolMetaItem == null) {
return 0;
}
IToolStats toolStats = toolMetaItem.getToolStats();
if (!toolStats.isUsingDurability(stack)) {
return vanillaDamage;
}
int itemDamage = getItemDamage(stack);
int maxDamage = getMaxItemDamage(stack);
int damageRemaining = maxDamage - itemDamage;
int newDamageValue = itemDamage + calculateToolDamage(stack, itemRand, vanillaDamage);
if (!simulate && !setInternalDamage(stack, newDamageValue)) {
GTUtility.setItem(stack, toolStats.getBrokenStack(stack));
}
return Math.min(vanillaDamage, damageRemaining);
}
return Math.min(vanillaDamage, damageRemaining);
return 1;
}

public int regainItemDurability(ItemStack itemStack, int maxDurabilityRegain) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/tools/ToolBuzzSaw.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public float getBaseDamage(ItemStack stack) {

@Override
public float getMaxDurabilityMultiplier(ItemStack stack) {
return 10.0f;
return 1.0f;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/tools/ToolChainsawHV.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {

@Override
public float getMaxDurabilityMultiplier(ItemStack stack) {
return 40.0F;
return 4.F;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/tools/ToolChainsawLV.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {

@Override
public float getMaxDurabilityMultiplier(ItemStack stack) {
return 10.0f;
return 1.0F;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/tools/ToolChainsawMV.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {

@Override
public float getMaxDurabilityMultiplier(ItemStack stack) {
return 20.0F;
return 2.0F;
}

@Override
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/gregtech/common/tools/ToolDrillHV.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
}

@Override
public float getMaxDurabilityMultiplier(ItemStack stack) {
return 40.0F;
}
public float getMaxDurabilityMultiplier(ItemStack stack) { return 4.0F; }

@Override
public ItemStack getBrokenStack(ItemStack stack) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/tools/ToolDrillLV.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {

@Override
public float getMaxDurabilityMultiplier(ItemStack stack) {
return 10.0f;
return 1.0f;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/tools/ToolDrillMV.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {

@Override
public float getMaxDurabilityMultiplier(ItemStack stack) {
return 20.0F;
return 2.0F;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public int getToolDamagePerContainerCraft(ItemStack stack) {

@Override
public float getMaxDurabilityMultiplier(ItemStack stack) {
return 10.0f;
return 2.0f;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/tools/ToolWrenchHV.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {

@Override
public float getMaxDurabilityMultiplier(ItemStack stack) {
return 40.0F;
return 4.0F;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/tools/ToolWrenchLV.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {

@Override
public float getMaxDurabilityMultiplier(ItemStack stack) {
return 10.0f;
return 1.0f;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/tools/ToolWrenchMV.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {

@Override
public float getMaxDurabilityMultiplier(ItemStack stack) {
return 20.0F;
return 2.0F;
}

@Override
Expand Down