NewGarbo
d0bfb2e2e9
Finishing touches with UtilItem. Lots of changes to tutorials, and added a PlayerEnterTerritory event.
2015-10-29 08:35:24 +00:00
NewGarbo
a063da4cae
Renamed some things to comply with standards. Also moved some of the bit flags around, and moved them into seperate parts.
2015-10-28 22:55:10 +00:00
NewGarbo
afadd61431
Added a few new item categories into UtilItem, and added the bitmasks to the materials belonging to said categories. Changed from using the 32bit int data type, to using the 64bit long data type, this should give me a bit more free space for more categories to put items in to, as I already ran out of space using a regular int.
2015-10-28 22:47:30 +00:00
NewGarbo
cffcf245e9
UtilItem.java overhaul, complete item attribute system added.
2015-10-28 22:14:08 +00:00
NewGarbo
8ce50d1fc7
Done most of the tutorial ghost mechanic, and also switched from using task's indexes for referencing the tasks, instead using names now. This should allow for much more flexibility, and adding/removing tasks will not be such a pain! (Having to switch all of the task indexes around for any code referencing tasks.)
2015-10-28 17:08:48 +00:00
NewGarbo
765fb4ce11
Created the ClansShopItem enumeration, which has every item that can be sold in shops, with their buy and sell prices. All shops have been updated to reference this enumeration to get the prices for items.
...
Made it so that players that are "weaklings" will be stripped of their weakling title, if the sell value of their inventory is greater than 2000 Gold.
This mechanic uses the ClansShopItem enumeration, and is the main reason why it was created, since all prices were normally hardcoded into the shop page classes.
2015-10-28 07:34:13 +00:00
NewGarbo
8d5b6e6d90
Don't show weakling particles above players that are not alive. Also removed debug message.
2015-10-27 10:18:14 +00:00
NewGarbo
1938bcf799
Fixed the "weakling" status not updating correctly.
2015-10-27 10:01:33 +00:00
NewGarbo
b4897e91fa
Fixed bug where an NPC's hologram would still stick around after the NPC is killed, since death and regular removal over time are handled separately.
2015-10-27 08:56:41 +00:00
NewGarbo
234799e55e
Fixed infinite recursion in AlligatorsTooth.
...
Fixed a NullPointer exception in the Gear UI when you don't select an item type and you continue on.
Made a way to visually see the task you are on in the getting started tutorial, by making it dark cyan.
2015-10-27 08:32:21 +00:00
NewGarbo
c30ece9d8b
Improved SafeLog to use the title system and holograms! Also removed knockback for NPCS
2015-10-26 19:48:20 +00:00
NewGarbo
da058881f8
Some bug fixes in the gear ui, added the shine to rare item factory (I FORGOT TO COMMIT THE CLASS LAST COMMIT ARGH)
...
added alligators tooth particles & sound
added wind blade power feature
2015-10-26 15:37:44 +00:00
NewGarbo
eb350a79c3
Added RareItemFactory (will add shine when lib helps me with it) and other small little fixes. Added a way to specify the amount of items in a single line in GearPage, so that armor and weapon type listings look more aesthetically pleasing.
2015-10-26 12:21:33 +00:00
NewGarbo
63406e9ce1
Moved GearManager back to it's original package, and stopped using it in GearPage. Removed commented code from GearCommand, as the gui is now finished and it is not needed anymore.
2015-10-26 07:57:00 +00:00
NewGarbo
7eab57c5dd
As per Chiss' request, made the gear ui go to next page when you choose an attribute.
2015-10-26 07:49:03 +00:00
NewGarbo
cc2aae9726
Final touches to the gear gui, making it now completely finished. hooray!
2015-10-26 00:08:03 +00:00
NewGarbo
327c129f46
Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}])
2015-10-25 12:28:12 +00:00
NewGarbo
1e4b3442fa
Conflicts:
...
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
2015-10-24 20:45:39 +01:00
NewGarbo
63bc492f2c
Almost completely finished the /gear ui, still a few bugs and missing features, but it's getting there. Logging off now, don't want to lose code.
2015-10-24 20:36:53 +01:00
Shaun Bennett
0d56eefd44
Titan/Rewards adjustments
2015-10-24 13:40:17 -04:00
NewGarbo
089c4420b2
Lots of progress towards a /gear gui, not finished though. commiting now because I'm leaving and don't want to lose the code.
2015-10-24 07:16:13 +01:00
Shaun Bennett
40afcaf26b
Global Packet Commands
2015-10-23 15:07:53 -04:00
NewGarbo
0c29805756
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-10-23 19:27:13 +01:00
NewGarbo
11b836da8b
Added Join/Quit messages.
...
Removed periods from attribute descriptions.
Fixed legendary item lore having incorrect formatting.
2015-10-23 16:59:30 +01:00
Cheese
af208da953
Merge branch 'alex-testrank'
2015-10-23 18:10:59 +11:00
Cheese
d9d0254e46
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-23 17:30:59 +11:00
Shaun Bennett
fd1638a572
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-10-23 02:17:57 -04:00
Shaun Bennett
5944b734be
More war fixes - still needs tweaking
2015-10-23 02:17:47 -04:00
Shaun Bennett
e3e7dd4694
Titan rewards from mythical chests
2015-10-23 02:08:31 -04:00
NewGarbo
4c381d41fe
Fixed second tutorial task misspelling, and added the first tutorial, which is /c help, as I completely forgot about it in the first place.
2015-10-23 06:10:09 +01:00
NewGarbo
18d998fc04
Fixed colors cutting out in the middle of the message in task information, moar fireworks!
2015-10-23 05:56:53 +01:00
AlexTheCoder
1512d87f9e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-23 00:28:32 -04:00
NewGarbo
825b519890
Finalization of tutorials, made my code more consistent, and renamed any parts of code that referred to tasks as parts refer to them as "tasks."
...
Removed unused imports, and other code cleanup stuff.
Renamed EndTutorialCommand to SkipTutorialCommand as the actual command is "/skiptutorial" instaed of "/endtutorial"
2015-10-21 21:50:46 +01:00
William Burns
e6bec41ca8
Fix "code too large" error.
2015-10-21 20:29:44 +01:00
NewGarbo
bf406493e3
Fixed tutorial tasks that rely on territory entrances not working because formatting...
2015-10-21 20:14:35 +01:00
Shaun Bennett
00a689ea03
War work
2015-10-21 14:48:27 -04:00
NewGarbo
112f34c77f
Fixed NullPointerException when clicking outside of inventory GUI.
2015-10-21 08:10:53 +01:00
Jonathan Williams
c719d693dd
Added delete benefit call for repository.
...
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
2015-10-21 01:15:09 -05:00
NewGarbo
a5df50de92
On going map tutorials started and finished.
2015-10-21 06:55:06 +01:00
NewGarbo
eb203131a7
Fixed import errors since I moved the getting started tutorial to a different package.
2015-10-21 06:19:23 +01:00
NewGarbo
bd5266251b
Finalized the getting started tutorial.
...
Added the last 5 tasks, and added a nice big ending (fireworks)
Added an ugly fix to the QAResetCommand, which I am really unhappy about, but can't find any other way about it. It's only a test command though, so it'll be removed in the final releases.
2015-10-21 06:17:18 +01:00
NewGarbo
c6cf47ee4e
I did not mean to commit that one line... Oh gosh that would have been bad... (addCoins onEnterTerritory). Was just for testing shops.
2015-10-21 04:36:47 +01:00
NewGarbo
227e9f7bfc
Pretty much finished with tutorials, not fully though, but I am simply pushing so I don't lose all my work.
...
CHANGES----
Added a little hack to ScoreboardElement.java that allows for a single element to clear the currently existing scoreboard lines output, or modify it.
Coded in the functionality of 7 tasks, will do the rest now.
2015-10-21 04:27:14 +01:00
Cheese
768ef4eb97
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-21 13:00:16 +11:00
NewGarbo
a2278297de
Created the base for tutorials, and created the getting started tutorial.
...
Have all the commands and most of the functionality in here now, but still need to do the scoreboard and some tweaking.
2015-10-19 17:16:48 +01:00
Jonathan Williams
3ef33bd9c5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-19 01:32:23 -05:00
Jonathan Williams
5e307da15a
Fix for inventory failure.
2015-10-19 01:32:12 -05:00
Shaun Bennett
6d7f15cd6d
Fix hub time after light flicker
2015-10-18 18:52:16 -04:00
Cheese
c7a5be9570
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-19 09:03:46 +11:00
Shaun Bennett
0a3f942575
Fix compile issue
2015-10-18 12:42:56 -04:00
