General minigame overhaul #134

Plajer · 2022-09-05T14:56:25Z

This pull request includes updates for Wizard, Medic and Tornado (not fully completed) kits as well as Entity Upgrades system (mostly messages).

Pardon any other changes such as old copyright updates and others.
Please review each file changed carefully.

# Conflicts: # pom.xml

Tigerpanzer02

See comments ;)

Tigerpanzer02 · 2022-09-05T17:20:33Z

src/main/java/plugily/projects/villagedefense/Main.java

@@ -1,6 +1,6 @@
 /*
 * Village Defense - Protect villagers from hordes of zombies
- * Copyright (c) 2022  Plugily Projects - maintained by Tigerpanzer_02 and contributors
+ * Copyright (C) 2022  Plugily Projects - maintained by 2Wild4You, Tigerpanzer_02 and contributors


don't change

Tigerpanzer02 · 2022-09-05T17:23:06Z

src/main/java/plugily/projects/villagedefense/Main.java

@@ -1,6 +1,6 @@
 /*
 * Village Defense - Protect villagers from hordes of zombies
- * Copyright (c) 2022  Plugily Projects - maintained by Tigerpanzer_02 and contributors
+ * Copyright (C) 2022  Plugily Projects - maintained by 2Wild4You, Tigerpanzer_02 and contributors


don't change

Tigerpanzer02 · 2022-09-05T17:27:30Z

src/main/java/plugily/projects/villagedefense/Main.java

+    getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_HOMECOMING_RESPAWNED_BY_TITLE", new Message("Kit.Content.Medic.Game-Item.Homecoming.Respawned-By-Title", ""));
+    getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_HOMECOMING_RESPAWNED_BY_SUBTITLE", new Message("Kit.Content.Medic.Game-Item.Homecoming.Respawned-By-Subtitle", ""));


title and subtitle can be made into one line with timings, check https://github.com/Plugily-Projects/MiniGamesBox/blob/development/MiniGamesBox%20Classic/src/main/java/plugily/projects/minigamesbox/classic/arena/PluginArenaManager.java#L112 (TitleBuilder)

Tigerpanzer02 · 2022-09-05T17:27:44Z

src/main/java/plugily/projects/villagedefense/arena/Arena.java

@@ -1,6 +1,6 @@
 /*
 * Village Defense - Protect villagers from hordes of zombies
- * Copyright (c) 2022  Plugily Projects - maintained by Tigerpanzer_02 and contributors
+ * Copyright (C) 2022  Plugily Projects - maintained by 2Wild4You, Tigerpanzer_02 and contributors


don't change

Tigerpanzer02 · 2022-09-05T17:29:26Z

src/main/java/plugily/projects/villagedefense/handlers/upgrade/EntityUpgradeMenu.java

@@ -1,6 +1,6 @@
 /*
 * Village Defense - Protect villagers from hordes of zombies
- * Copyright (c) 2022  Plugily Projects - maintained by Tigerpanzer_02 and contributors
+ * Copyright (C) 2022  Plugily Projects - maintained by 2Wild4You, Tigerpanzer_02 and contributors


don't change

src/main/java/plugily/projects/villagedefense/kits/premium/WizardKit.java

Tigerpanzer02 · 2022-09-05T17:52:07Z

src/main/java/plugily/projects/villagedefense/kits/premium/WizardKit.java

-        VersionUtils.sendParticles("TOWN_AURA", null, loc, 5, 0, 0, 0);
-        for(Entity en : loc.getChunk().getEntities()) {
-          if(!(CreatureUtils.isEnemy(en)) || en.getLocation().distance(loc) >= 1.5 || en.equals(player)) {
+        for (Entity en : loc.getChunk().getEntities()) {


entity, livingEntity

Tigerpanzer02 · 2022-09-05T17:52:14Z

src/main/java/plugily/projects/villagedefense/kits/premium/WizardKit.java

  }

-  private void applyMagicAttack(Player player) {
+  private void applyMagicAttack(User user) {
+    XParticle.drawLine(user.getPlayer(), 40, 1, ParticleDisplay.of(XParticle.getParticle("FLAME")));


Tigerpanzer02 · 2022-09-05T17:53:28Z

src/main/java/plugily/projects/villagedefense/kits/premium/WizardKit.java

+          //wand damage: 30/32/35 scaling % of entity's max health, we use direct health set to override armors etc.
+          entity.damage(0, user.getPlayer());
+          double maxHealthPercent = getWandPercentageDamage(arena);
+          entity.setHealth(Math.max(0, entity.getHealth() - (entity.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() / 100.0) * maxHealthPercent));


Use VersionUtil getMaxHealth Attributes will cause issues on direct call for legacy versions

Tigerpanzer02

notice we need to check if that versioncheck will already be enough for 1.8

Tigerpanzer02 · 2022-09-05T18:20:55Z

pom.xml

-                    <changelogFile>${project.basedir}/CHANGELOG.md</changelogFile>
-                </configuration>
-            </plugin>
+


let betty inside

Tigerpanzer02 · 2022-09-05T18:21:19Z

src/main/java/plugily/projects/villagedefense/Main.java

+    getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_HOMECOMING_RESPAWNED_BY_TITLE", new Message("Kit.Content.Medic.Game-Item.Homecoming.Respawned-By-Title", ""));
+    getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_HOMECOMING_RESPAWNED_BY_SUBTITLE", new Message("Kit.Content.Medic.Game-Item.Homecoming.Respawned-By-Subtitle", ""));


still two titles?

its possible to use the newly added TitleBuilder from MinigamesBox which let you combine both in one.
e.g.
new TitleBuilder("TITLE").asKey().arena(arena).player(player).sendPlayer();
Title: "20,30,20;%arena_name%;%arena_players_size%/%arena_max_players%"

src/main/java/plugily/projects/villagedefense/kits/premium/TornadoKit.java

Plajer · 2022-09-26T11:12:51Z

todo: abilities registry

Plajer · 2022-09-26T11:13:51Z

todo: let each kit register messages for game on their own, not in main class

Plajer · 2022-09-26T12:01:23Z

todo: percentage damage utils to reduce 3 lines into 1 line utility, it will definitely be used across multiple kits

Plajer · 2022-10-26T12:58:00Z

will finish it someday definitely

Tigerpanzer02 · 2022-10-29T07:00:52Z

will finish it someday definitely

hopefully next week xD ;)

Plajer · 2022-11-17T22:52:40Z

todo: Revamp final defense (entity upgrade for golem), it's too weak, reference here:

Village_Defense/src/main/java/plugily/projects/villagedefense/events/EntityUpgradeListener.java

Line 118 in ae92973

for(Creature zombie : new ArrayList<>(arena.getEnemies())) {

Slow 1 for every alive zombie for 0.25 seconds
Damage of 0.25 heart for every zombie alive

It is definitely too weak.

# Conflicts: # src/main/java/plugily/projects/villagedefense/Main.java

Killers will now split orbs for all people that assisted in the kill, any people that buffed the killer within 10 seconds or debuffed or attacked enemy that was killed

# Conflicts: # build.gradle.kts

On wave refresh players are now partially healed (25% max health) and villagers are healed a bit as well

sonarcloud · 2024-04-20T12:03:18Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

Plajer and others added 9 commits September 1, 2022 19:24

feat: Wizard Kit updated

19b952c

Bump pom.xml from 4.6.1-dev67 to 4.6.1-dev68

f06a59b

feat: Medic Kit update

ab63efa

feat: Include power level in golem/wolf custom name

6acf8fe

feat: Wizard kit cooldowns API change

a92eb32

feat: Tornado kit (working on it)

f41c7a1

feat: Kit actionbar abilities draft

a4daf99

Merge remote-tracking branch 'github/development' into development

81e99bd

Merge remote-tracking branch 'github/development' into development

243ed15

# Conflicts: # pom.xml

Plajer requested a review from Tigerpanzer02 September 5, 2022 14:56

Plajer marked this pull request as draft September 5, 2022 17:41

Tigerpanzer02 requested changes Sep 5, 2022

View reviewed changes

Plajer added 4 commits September 5, 2022 20:03

revert: Copyright modified

5c497cd

fix: 1.8 fixes and variables naming

7f41d01

fix: 1.8 health attributes

439ed69

fix: 1.8 material utils

26a4d10

Tigerpanzer02 reviewed Sep 5, 2022

View reviewed changes

Plajer added 3 commits September 5, 2022 20:28

sadsadasdas

8641ca3

feat: Improve Tornado kit

6cea17a

Merge remote-tracking branch 'origin/development' into development

678b410

feat: Final flight ability for Tornado kit

0200c3d

Plajer and others added 3 commits November 18, 2022 15:35

Merge remote-tracking branch 'origin/development' into development

8eed808

# Conflicts: # src/main/java/plugily/projects/villagedefense/Main.java

fix: Adjust MessageInitializer

07b719f

Merge branch 'development' into development

f54875c

Plajer and others added 29 commits August 29, 2023 17:42

feat: Entities health bars improved

443a920

feat: Nerf baby zombie speed a bit

fc6dac3

feat: Assists system implemented

2710d91

Killers will now split orbs for all people that assisted in the kill, any people that buffed the killer within 10 seconds or debuffed or attacked enemy that was killed

Merge remote-tracking branch 'github/development' into development

820a236

# Conflicts: # build.gradle.kts

feat: Buff medic with villagers healing passive

37030da

fix: Door logc fix, remove debug

34a8e27

feat: Change wave refresh logic

0ba5abc

On wave refresh players are now partially healed (25% max health) and villagers are healed a bit as well

feat: Shot bow kit recreated

a1ae533

fix: Apply normal speed for unprovoked golems

2c5a37c

feat: Natural regeneration for pets

694b438

fix: Players can steal pets by upgrading them

f54d74d

fix: Pet spawn limits fixed

1885731

fix: Small nerfs for kits

ce19560

fix: Remove pets from arena properly

188023d

feat: Disable AI after game end

91b011c

fix: Nerf tnt explosion and friendly fire

44ad92c

fix: Shotbow fixes

c16b67e

fix: No zombies to clean threw exception

8a4cc49

fix: Better villager hurt global sound

92b4472

fix: Vehicle steer fix

93d3ea7

feat: Trying to smoothen orbs given in later wave

a60dfec

fix: Upgrade minigame core

c8ad2d3

fix: Do not give flesh to spectators

2fc1611

Bump version from 5.0.1-SNAPSHOT3 to 5.0.1-SNAPSHOT4

33744db

feat: Village Defense Gold

351ffc8

Merge remote-tracking branch 'origin/development' into development

fcc9525

Bump version from 5.0.1-SNAPSHOT4 to 5.0.1-SNAPSHOT5

1e86696

feat: VDUserManager, README update

8964d93

Bump version from 5.0.1-SNAPSHOT5 to 5.0.1-SNAPSHOT6

ae9aba5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

General minigame overhaul #134

General minigame overhaul #134

Plajer commented Sep 5, 2022

Tigerpanzer02 left a comment

Tigerpanzer02 Sep 5, 2022

Tigerpanzer02 Sep 5, 2022

Tigerpanzer02 Sep 5, 2022

Tigerpanzer02 Sep 5, 2022

Tigerpanzer02 Sep 5, 2022

Tigerpanzer02 Sep 5, 2022

Tigerpanzer02 Sep 5, 2022

Tigerpanzer02 Sep 5, 2022

Tigerpanzer02 left a comment

Tigerpanzer02 Sep 5, 2022

Tigerpanzer02 Sep 5, 2022

Plajer Sep 5, 2022

Tigerpanzer02 Oct 29, 2022

Plajer commented Sep 26, 2022

Plajer commented Sep 26, 2022

Plajer commented Sep 26, 2022

Plajer commented Oct 26, 2022

Tigerpanzer02 commented Oct 29, 2022

Plajer commented Nov 17, 2022 •

edited

sonarcloud bot commented Apr 20, 2024

		getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_HOMECOMING_RESPAWNED_BY_TITLE", new Message("Kit.Content.Medic.Game-Item.Homecoming.Respawned-By-Title", ""));
		getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_HOMECOMING_RESPAWNED_BY_SUBTITLE", new Message("Kit.Content.Medic.Game-Item.Homecoming.Respawned-By-Subtitle", ""));

General minigame overhaul #134

Are you sure you want to change the base?

General minigame overhaul #134

Conversation

Plajer commented Sep 5, 2022

Tigerpanzer02 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Tigerpanzer02 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Plajer commented Sep 26, 2022

Plajer commented Sep 26, 2022

Plajer commented Sep 26, 2022

Plajer commented Oct 26, 2022

Tigerpanzer02 commented Oct 29, 2022

Plajer commented Nov 17, 2022 • edited

sonarcloud bot commented Apr 20, 2024

Quality Gate passed

Plajer commented Nov 17, 2022 •

edited