Commit Graph
141 Commits
Author SHA1 Message Date
Waverunner c0a80a175c Refactored Scripts to use Groovy instead of JavaScript 2017-05-08 20:23:54 -04:00
Obique PSWG 3e544b188c Added in a /qatool details deathblow - to force a deathblow for testing 2017-05-02 08:56:02 -05:00
Iosnowore bc1112650c Dueling implementation now only requires one list of CreatureObjects (instead of two) 2017-04-04 19:17:16 -07:00
Iosnowore 77231fa85c Changed PR based on Oblique's comments.
Also Added .db-journal to git ignore (file created by a 3d party SQLite GUI program)
2017-04-04 14:01:55 -07:00
Iosnowore 6683912383 Fixed a bug when player who sent a duel tried to end when the duel was active. 2017-04-02 16:15:29 -07:00
Iosnowore 6909cf0d59 Removed extra indent 2017-04-02 14:12:10 -07:00
Iosnowore 42f24d8ee4 Moved duel checks from DuelPlayerService to their script. 2017-04-02 14:10:02 -07:00
Iosnowore f24a8b0cb0 - Added DuelEventType enum to DuelPlayerIntent
- DuelPlayerService now handles the DuelEventType enum
(Tested on localhost and worked)
2017-01-24 23:02:39 -05:00
Iosnowore f05938d2fe Added end duel command 2017-01-24 20:40:16 -05:00
Iosnowore 191d3d84c7 Added DuelPlayerService (not fully complete yet) 2017-01-24 20:12:28 -05:00
Obique PSWG 1ec1503014 Fixed NGE-542 'Inviting non-creatures to a group' 2017-01-08 12:56:41 -06:00
Mads Boddum 0ef1976fc5 Fixed invalid target error message not being displayed when inviting nothing to a group 2017-01-04 18:31:51 +01:00
Mads Boddum b27e3f46cf Added support for inviting players to a group that are outside your awareness 2017-01-04 18:07:10 +01:00
Obique PSWG 94fb18af8d Massive refactor of groups 2017-01-04 02:49:01 -06:00
Mads Boddum 518ad8b2c6 Fixed an issue where backpack contents were invisible 2016-10-31 07:45:02 +01:00
Mads Boddum 0a7a978c44 Added admin command /grantSkill for giving yourself a skill 2016-10-27 20:23:41 +02:00
Mads Boddum 3eec9e740d Scripts.invoke() now throws FileNotFoundException if script file wasn't found 2016-10-26 04:15:49 +02:00
Mads Boddum 54db22252e Added support for single target damage abilities 2016-10-23 04:16:40 +02:00
Mads Boddum 2bbf7e63af Fixed /pvp 2016-10-13 04:25:24 +02:00
Mads Boddum 22993660ae Weapon damage is now accounted for 2016-10-12 15:43:21 +02:00
Mads Boddum c6159b0e23 Carbines can now be fired 2016-10-12 15:42:53 +02:00
Mads Boddum 709db360e1 Weapon damage now affects combat calculations 2016-10-12 14:24:28 +02:00
Mads Boddum 0d42d02749 DeathblowIntent is now only used for deathblow requests 2016-10-03 13:26:08 +02:00
Mads Boddum bc61075d6b Added deathblows, currently only seems to work through radial 2016-10-03 12:59:51 +02:00
Obique PSWG dfa66a4561 Merged in M4SS/holocore/transferitem_cmd (pull request #299)
NGE-455 - TransferItem Commands
2016-09-19 08:36:39 -05:00
Mads Boddum ab7d962ad7 Refactored object transfer commands and added in a bunch of checks 2016-09-17 09:12:14 +02:00
Obique PSWG 1c506610cb Merged in M4SS/holocore/group_chat (pull request #294)
NGE-128 - Group chat
2016-09-16 04:42:00 -05:00
Mads Boddum 70ba778fad Implemented group chat 2016-09-16 08:36:42 +02:00
Mads Boddum cc9a8730c5 The default weapon is now treated as a slotted object 2016-09-16 04:12:37 +02:00
Mads Boddum 5f69ab14d8 Turned spaces into tabs in cmdWatch and cmdStopWatching 2016-09-14 04:50:18 +02:00
Mads Boddum 095e8e1868 Initial work on groupchat 2016-09-11 01:11:52 +02:00
Mads Boddum 1c23a32ddc Added ability to stop watching a performer 2016-09-09 06:40:09 +02:00
Mads Boddum 3ef10e69a4 Added missing WatchIntent and cmdWatch script 2016-09-09 04:00:07 +02:00
Mads Boddum d45289b41b Refactored flourish command from script to callback and enhanced performance of logic 2016-09-09 00:08:27 +02:00
Mads Boddum 633675c3b6 Added basic support for flourishes 2016-09-08 18:33:12 +02:00
Skyler Lehan a55a1ec476 Fixed an issue with /leavegroup 2016-08-14 22:35:01 -04:00
Skyler Lehan 12038023c7 Fixed remaining issues in the PR for NGE-111 2016-07-05 18:07:14 -04:00
Skyler Lehan 223505257d Fixed issues in PR #229
groupMakeMasterLooter.js/groupUninvite.js
- Fixed issues with unnecessary spaces

GroupObject
- fixed unnecessary line breaks
- refactored loot rule from an int into an enum
- fixed sub int spacing
- fixed name on getLeaderId

GroupService
- fixed ScheduledExecutorService so that there is only one, and it spawns threads and puts the Future in the map of CreatureObject to Future
- changed types for logoffTimers to a map
- commented out the loot stuff for now
- refactored a good chunk of handleInvite to another method
2016-06-19 20:06:51 -04:00
Skyler Lehan cfe88e0032 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into groups
# Conflicts:
#	src/resources/objects/group/GroupObject.java
2016-06-06 19:25:02 -04:00
Obique PSWG e7f4616f9a Made intent factory broadcasts sequential and added additional awareness debug to details.js 2016-06-06 08:00:56 -05:00
Skyler Lehan 1a58d05ca7 Attempted to implement uninvitation, as sending null inviter data does not close the invitation dialog 2016-05-30 21:29:16 -04:00
Skyler Lehan 124bb68220 Added handling for looting and loot master setting, however the makeMasterLooter command is not being seen by holocore 2016-05-30 19:54:48 -04:00
Skyler Lehan d417b446d6 Added the declination messages sent to each character and handled the decline 2016-05-30 17:52:05 -04:00
Obique PSWG c788f58525 Fixed equipment transfer code 2016-05-30 15:03:37 -05:00
Skyler Lehan ef8ab0f4c6 Merge branch 'quality_assurance' of bitbucket.org:slehan/holocore into groups 2016-05-24 15:50:15 -04:00
Skyler Lehan 141b9e651d Implemented group kicking as well
cmdDismissGroupMember
- command hook to send the kick event

GroupEventIntent
- added the GROUP_KICK intent

GroupServices
- fixed the brace on handleMakeLeader
- added handleKick
2016-05-24 14:57:22 -04:00
Skyler Lehan 311cb5b693 Leadership changes for NGE-111
groupMakerLeader.js
- serves as the command hook for the make leader command

GroupService.java
- now handles the GROUP_MAKE_LEADER intent
- added handleMakeLeader to take care of switching the leader to another character
- refactored sending invites out to sendInvite, one that allows the passage of the current groupID, and one that sets it to -1 for group creation
- handleGroupLeave also filled in
2016-05-19 12:59:59 -04:00
Skyler Lehan 45942bbf9e Fixed logic for disband and leave group commands. 2016-05-18 18:22:45 -04:00
Skyler Lehan 17b4ac76b5 Hopefully fixed the tabs 2016-05-18 18:19:08 -04:00
Skyler Lehan d8db483fd4 Started on groups NGE-111
GroupEventIntent
- Added the GROUP_LEAVE event to the GroupEventType enum to flag for the leaveGroup command

GameManager
- reenabled the GroupService

GroupService
- added a check for the GROUP_LEAVE event type
- created the method handleGroupLeave which will process a player leaving a group and disband if necessary, currently just stubbed
2016-05-18 17:57:25 -04:00