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

Feature/pvp system #2723

Merged
merged 28 commits into from
Aug 2, 2018
Merged

Feature/pvp system #2723

merged 28 commits into from
Aug 2, 2018

Conversation

Raycoms
Copy link
Contributor

@Raycoms Raycoms commented Aug 1, 2018

Adds the first part of complete PVP system.
This contains:

Changes proposed in this pull request:

  • A configuration value to turn this on and off
  • A way to identify teams of guards and select their color
  • Permission handling to allow griefing under certain conditions
  • TownHall handling to delete the colony if destroyed.

Review please

Copy link
Collaborator

@LDTTeam-Buildsystem LDTTeam-Buildsystem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Analysis Complete

Statistics:
Count New Old Diff
Total 0 0 0 0
Errors 0 0 0 0
More Information:

marchermans
marchermans previously approved these changes Aug 2, 2018
@@ -66,7 +67,7 @@ private void initBlock()
//Blast resistance for creepers etc. makes them explosion proof
setResistance(RESISTANCE);
//Hardness of 10 takes a long time to mine to not loose progress
setHardness(HARDNESS);
setHardness(Configurations.gameplay.pvp_mode ? HARDNESS * 2 : HARDNESS);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumb this factor to 4. It should be a challenge.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea

import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
import org.jetbrains.annotations.NotNull;

import java.util.stream.Stream;

import static com.minecolonies.api.util.constant.Constants.*;

/**
* Class handling the Chief Sword item.
*/
public class ItemChiefSword extends ItemSword
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe buff the ChiefSword in PVP Mode?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, it's quite rare and it's less op than most tinkers swords as well, so I don't see much of an issue with it.

@LDTTeam-Buildsystem LDTTeam-Buildsystem dismissed their stale review August 2, 2018 12:33

A new analysis is being ran. Please wait for the results.

Copy link
Collaborator

@LDTTeam-Buildsystem LDTTeam-Buildsystem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Analysis Complete

Statistics:
Count New Old Diff
Total 0 0 0 0
Errors 0 0 0 0
More Information:

@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
Copy link
Collaborator

@LDTTeam-Buildsystem LDTTeam-Buildsystem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Analysis Complete

Statistics:
Count New Old Diff
Total 0 0 0 0
Errors 0 0 0 0
More Information:

Copy link
Collaborator

@LDTTeam-Buildsystem LDTTeam-Buildsystem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Analysis Complete

Statistics:
Count New Old Diff
Total 0 0 0 0
Errors 0 0 0 0
More Information:

@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
@LDTTeam-Buildsystem LDTTeam-Buildsystem dismissed their stale review August 2, 2018 19:54

A new analysis is being ran. Please wait for the results.

Copy link
Collaborator

@LDTTeam-Buildsystem LDTTeam-Buildsystem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Analysis Complete

Statistics:
Count New Old Diff
Total 0 0 0 0
Errors 0 0 0 0
More Information:

@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
@ldtteam ldtteam deleted a comment Aug 2, 2018
Copy link
Collaborator

@LDTTeam-Buildsystem LDTTeam-Buildsystem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Analysis Complete

Statistics:
Count New Old Diff
Total 0 0 0 0
Errors 0 0 0 0
More Information:

@LDTTeam-Buildsystem LDTTeam-Buildsystem dismissed stale reviews from themself August 2, 2018 20:13

A new analysis is being ran. Please wait for the results.

Copy link
Collaborator

@LDTTeam-Buildsystem LDTTeam-Buildsystem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Analysis Complete

Statistics:
Count New Old Diff
Total 0 0 0 0
Errors 0 0 0 0
More Information:

@Raycoms Raycoms merged commit 0e0971a into version/1.12 Aug 2, 2018
@Raycoms Raycoms deleted the feature/pvp-system branch August 2, 2018 20:29
@ldtteam ldtteam deleted a comment Aug 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants