-
-
Notifications
You must be signed in to change notification settings - Fork 30
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
General minigame overhaul #134
base: development
Are you sure you want to change the base?
Changes from 13 commits
19b952c
f06a59b
ab63efa
6acf8fe
a92eb32
f41c7a1
a4daf99
81e99bd
243ed15
5c497cd
7f41d01
439ed69
26a4d10
8641ca3
6cea17a
678b410
0200c3d
8eed808
07b719f
f54875c
fbb90d3
db0e29a
327cf52
d6efa58
34b9eb1
a2609b9
f175604
d06ef50
359933e
853b51d
2af6507
eac7af4
0e29908
a755342
ea6e7f1
99db1f6
8c50927
baf93d8
09c26f9
651b38c
e963ae9
23ccafc
f7579d7
b479c65
e7223bc
bbec6f6
0193978
dc41920
c54c4c8
d00fb78
ce2addf
56b45e9
7b3c520
b84225e
c6b6491
34a42fb
bd789eb
4bd7765
78b1aa7
f1f5e69
e5376b9
c4d8ca0
89dae76
dab8dfa
a9fbf41
085a4af
125cf94
437d9e5
23cd523
95b4b66
258d0d6
13a4725
93a6549
f62c71f
4920d9d
66dc6c6
1762d60
d20d00d
ae670fd
c070fbf
59bbd6c
0f8be20
ea67415
443a920
fc6dac3
2710d91
820a236
37030da
34a8e27
0ba5abc
a1ae533
2c5a37c
694b438
f54d74d
1885731
ce19560
188023d
91b011c
44ad92c
c16b67e
8a4cc49
92b4472
93d3ea7
a60dfec
c8ad2d3
2fc1611
33744db
351ffc8
fcc9525
1e86696
8964d93
ae9aba5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,12 +18,17 @@ | |
|
||
package plugily.projects.villagedefense; | ||
|
||
import java.io.File; | ||
import java.util.Arrays; | ||
import java.util.logging.Level; | ||
|
||
import org.bukkit.configuration.file.FileConfiguration; | ||
import org.bukkit.entity.Player; | ||
import org.bukkit.plugin.PluginDescriptionFile; | ||
import org.bukkit.plugin.java.JavaPluginLoader; | ||
import org.jetbrains.annotations.Nullable; | ||
import org.jetbrains.annotations.TestOnly; | ||
|
||
import plugily.projects.minigamesbox.classic.PluginMain; | ||
import plugily.projects.minigamesbox.classic.api.StatisticType; | ||
import plugily.projects.minigamesbox.classic.arena.PluginArena; | ||
|
@@ -83,10 +88,6 @@ | |
import plugily.projects.villagedefense.kits.premium.TornadoKit; | ||
import plugily.projects.villagedefense.kits.premium.WizardKit; | ||
|
||
import java.io.File; | ||
import java.util.Arrays; | ||
import java.util.logging.Level; | ||
|
||
/** | ||
* Created by Tom on 12/08/2014. | ||
* Updated by Tigerpanzer_02 on 03.12.2021 | ||
|
@@ -298,6 +299,7 @@ public void addMessages() { | |
getMessageManager().registerMessage("UPGRADE_MENU_UPGRADES_DEFENSE_NAME", new Message("Upgrade-Menu.Upgrades.Final-Defense.Name", "")); | ||
getMessageManager().registerMessage("UPGRADE_MENU_UPGRADES_DEFENSE_DESCRIPTION", new Message("Upgrade-Menu.Upgrades.Final-Defense.Description", "")); | ||
|
||
getMessageManager().registerMessage("KIT_LOCKED_TILL", new Message("Kit.Locked-Till", "")); | ||
|
||
//CLEANER KIT | ||
|
||
|
@@ -383,8 +385,11 @@ public void addMessages() { | |
|
||
getMessageManager().registerMessage("KIT_CONTENT_TORNADO_NAME", new Message("Kit.Content.Tornado.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_TORNADO_DESCRIPTION", new Message("Kit.Content.Tornado.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_TORNADO_GAME_ITEM_NAME", new Message("Kit.Content.Tornado.Game-Item.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_TORNADO_GAME_ITEM_DESCRIPTION", new Message("Kit.Content.Tornado.Game-Item.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_TORNADO_GAME_ITEM_TORNADO_NAME", new Message("Kit.Content.Tornado.Game-Item.Tornado.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_TORNADO_GAME_ITEM_TORNADO_DESCRIPTION", new Message("Kit.Content.Tornado.Game-Item.Tornado.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_TORNADO_GAME_ITEM_MONSOON_NAME", new Message("Kit.Content.Tornado.Game-Item.Monsoon.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_TORNADO_GAME_ITEM_MONSOON_DESCRIPTION", new Message("Kit.Content.Tornado.Game-Item.Monsoon.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_TORNADO_GAME_ITEM_MONSOON_ACTIVE_ACTION_BAR", new Message("Kit.Content.Tornado.Game-Item.Monsoon.Active-Action-Bar", "")); | ||
|
||
//TERMINATOR | ||
|
||
|
@@ -402,6 +407,7 @@ public void addMessages() { | |
getMessageManager().registerMessage("KIT_CONTENT_TELEPORTER_TELEPORT_WARNING", new Message("Kit.Content.Teleporter.Teleport.Warning", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_TELEPORTER_TELEPORT_PLAYER", new Message("Kit.Content.Teleporter.Teleport.Player", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_TELEPORTER_TELEPORT_NOT_FOUND", new Message("Kit.Content.Teleporter.Teleport.Not-Found", "")); | ||
//todo final flight ability | ||
|
||
//HEAVY_TANK | ||
|
||
|
@@ -431,6 +437,15 @@ public void addMessages() { | |
|
||
getMessageManager().registerMessage("KIT_CONTENT_MEDIC_NAME", new Message("Kit.Content.Medic.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_MEDIC_DESCRIPTION", new Message("Kit.Content.Medic.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_AURA_NAME", new Message("Kit.Content.Medic.Game-Item.Aura.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_AURA_DESCRIPTION", new Message("Kit.Content.Medic.Game-Item.Aura.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_AURA_ACTIVE_ACTION_BAR", new Message("Kit.Content.Medic.Game-Item.Aura.Active-Action-Bar", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_AURA_HEALED_BY_ACTION_BAR", new Message("Kit.Content.Medic.Game-Item.Aura.Healed-By-Action-Bar", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_HOMECOMING_NAME", new Message("Kit.Content.Medic.Game-Item.Homecoming.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_HOMECOMING_DESCRIPTION", new Message("Kit.Content.Medic.Game-Item.Homecoming.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_MEDIC_GAME_ITEM_HOMECOMING_ACTIVATE", new Message("Kit.Content.Medic.Game-Item.Homecoming.Activate", "")); | ||
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", "")); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. still two titles? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. its possible to use the newly added TitleBuilder from MinigamesBox which let you combine both in one. |
||
|
||
//WILD_NAKED | ||
|
||
|
@@ -442,10 +457,15 @@ public void addMessages() { | |
|
||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_NAME", new Message("Kit.Content.Wizard.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_DESCRIPTION", new Message("Kit.Content.Wizard.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_GAME_ITEM_ESSENCE_NAME", new Message("Kit.Content.Wizard.Game-Item.Essence.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_GAME_ITEM_ESSENCE_DESCRIPTION", new Message("Kit.Content.Wizard.Game-Item.Essence.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_GAME_ITEM_WAND_NAME", new Message("Kit.Content.Wizard.Game-Item.Wand.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_GAME_ITEM_WAND_DESCRIPTION", new Message("Kit.Content.Wizard.Game-Item.Wand.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_GAME_ITEM_FLOWER_NAME", new Message("Kit.Content.Wizard.Game-Item.Flower.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_GAME_ITEM_FLOWER_DESCRIPTION", new Message("Kit.Content.Wizard.Game-Item.Flower.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_GAME_ITEM_FLOWER_ACTIVATE", new Message("Kit.Content.Wizard.Game-Item.Flower.Activate", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_GAME_ITEM_BLOODLUST_NAME", new Message("Kit.Content.Wizard.Game-Item.Bloodlust.Name", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_GAME_ITEM_BLOODLUST_DESCRIPTION", new Message("Kit.Content.Wizard.Game-Item.Bloodlust.Description", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_GAME_ITEM_BLOODLUST_ACTIVATE", new Message("Kit.Content.Wizard.Game-Item.Bloodlust.Activate", "")); | ||
getMessageManager().registerMessage("KIT_CONTENT_WIZARD_GAME_ITEM_BLOODLUST_ACTIVE_ACTION_BAR", new Message("Kit.Content.Wizard.Game-Item.Bloodlust.Active-Action-Bar", "")); | ||
|
||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
* Village Defense - Protect villagers from hordes of zombies | ||
* Copyright (c) 2022 Plugily Projects - maintained by Tigerpanzer_02 and contributors | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
package plugily.projects.villagedefense.kits; | ||
|
||
import plugily.projects.villagedefense.arena.Arena; | ||
|
||
/** | ||
* @author Plajer | ||
* <p> | ||
* Created at 01.09.2022 | ||
*/ | ||
public class KitSpecifications { | ||
|
||
public static GameTimeState getTimeState(Arena arena) { | ||
if (arena.getWave() <= 15) { | ||
return GameTimeState.EARLY; | ||
} else if (arena.getWave() <= 30) { | ||
return GameTimeState.MID; | ||
} else { | ||
return GameTimeState.LATE; | ||
} | ||
} | ||
|
||
public enum GameTimeState { | ||
LATE, MID, EARLY | ||
} | ||
|
||
public enum ActionBarDisplay { | ||
DAMAGE_EFFECT(0), BUFFS(1), HEALING(2), HEALING_AND_BUFFS(3), PASSIVE(4), ULTIMATE(5), | ||
LOW_PRIORITY(1), MEDIUM_PRIORITY(4), HIGH_PRIORITY(5), SYSTEM_PRIORITY(99); | ||
|
||
private int priority; | ||
|
||
ActionBarDisplay(int priority) { | ||
this.priority = priority; | ||
} | ||
|
||
public int getPriority() { | ||
return priority; | ||
} | ||
} | ||
|
||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let betty inside