Commit Graph
396 Commits
Author SHA1 Message Date
Waverunner 5b2ce53cb3 Merge pull request #229 from ProjectSWGCore/Wave_Entertainer
Merge Wave_Entertainer
2014-03-23 16:06:38 -04:00
Seefo c0fcda14df Fixed issue #114 2014-03-23 16:04:57 -04:00
Waverunner 0f390c063b No exp for entertainer above 90, fixed unity radial, changed giveItems 2014-03-23 15:59:29 -04:00
Seefo bd228e971a Fixed issue #227 and #202 2014-03-23 15:03:44 -04:00
Waverunner d108353614 Merge remote-tracking branch 'origin/master' into Wave_Entertainer
Conflicts:
	src/services/BuffService.java
	src/services/collections/CollectionService.java
2014-03-23 14:32:45 -04:00
Waverunner e2a09f12d4 Roadmap Rewards use giveItem, roadmap rewards call script based on profession 2014-03-23 14:04:21 -04:00
Waverunner cf5c36dd29 Added Buff Workshop Collection, hologram variable to creatureobject
(Added) BuffWorkshop Collection
(Code) Added hologram variable to CreatureObject
(BugFix) Inspiration ticks stop at max duration
2014-03-23 13:42:18 -04:00
Treeku 554bba531a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-23 16:53:11 +00:00
Treeku 7d8725d60b Added buffer to buff funcs, added buff checks 2014-03-23 16:49:59 +00:00
Seefo d00aa83050 Fixed a few exploits. See extended.
Skills obtained through the expertise system are now validated to make
sure they are legitimate expertise skills.
Player expertise points are also now factored in instead of letting the
client do all the calculations.
Command "setcurrentskilltitle" now checks if the player has obtained the
skill title to prevent abuse of the command.
2014-03-23 12:27:42 -04:00
Treeku 51899bef77 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-23 15:09:27 +00:00
Treeku efdb69ff57 Fixed major counter-type collection bugs 2014-03-23 15:08:46 +00:00
Ziggeh a3e7b10372 Buffs - Permanent duration buffs now correctly replace non-permanent version 2014-03-23 02:46:47 +01:00
Waverunner 640973da22 Merge remote-tracking branch 'origin/Wave_Collections' into Wave_Entertainer 2014-03-22 12:14:38 -04:00
Waverunner d5f91ab3a1 Merge remote-tracking branch 'origin/master' into Wave_Entertainer
Conflicts:
	scripts/commands/colorlights.py
	scripts/commands/dazzle.py
	scripts/commands/firejet.py
	scripts/commands/smokebomb.py
	scripts/commands/ventriloquism.py
2014-03-22 11:56:54 -04:00
Waverunner ffc9aec1b1 Added Inspiration ticks, effects for Multi-Tier Performance Abilities
(BugFix) Build-A-Buff applies correct stats now
-- NOTE: Stats that the player does not have yet may not show in
character sheet but the server will recognize still recognize their new
stats
(Added) Inspiration Ticks
(BugFix) Inspiration Buffs time corresponds to the players inspiration
ticks.
(BugFix) "Watch" on radial menu working again
(Added) Put in the effects for the multi-tiered performance abilities
(Feature) You can now type /[performance effect] [tier number] to use
that specific effect
(BugFix) showFlyText boolean for showing to observers or not (fixes
other players exp gain shown to other players)
(Code) Few minor additions/fixes
2014-03-22 11:47:37 -04:00
Treeku d1fff9e069 Fixed buff duration check, fixed group buffs
- The duration needed to be set on the buff object "before "the buff is
actually added.  Because of this, I made the distinction between setup(0
(setting up the buff object) and add() (adding the buff stats to the
player).

- Group buffs would add the buff based on each individual player's
skillmods instead of the buffer's.  Due to this, I made a "buffer"
parameter for doAddBuff().  If there is a buffer, regardless of it's a
buffer within our group, we can specify them, otherwise provide null.
2014-03-22 02:07:53 +00:00
Treeku 2b6ada777c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-21 16:41:46 +00:00
Treeku 54cc7c3bcc radialFilename comes from script func if possible
This means any changes to the radial filename are retroactive.

It'll check server templates for getRadialFilename(), if not found,
it'll check the radial_filename attachment variable.
2014-03-21 16:41:00 +00:00
Treeku 867ea8972a Instance lockouts cleared at 6AM GMT 2014-03-21 16:34:33 +00:00
Waverunner ca4e0559a1 Added performance effects, fixed band flos, minor ent service code changes
(Bug Fix) Band Flourishes will now give experience
(Added) Performance Commands
(Code) Changed to ConcurrentHashMap for performance tables
2014-03-20 18:00:13 -04:00
Waverunner b434b96f46 Merge remote-tracking branch 'origin/master' into Wave_Collections 2014-03-20 13:57:52 -04:00
Treeku 36458239d3 Added object tracking lists to instances
Add objects with instance.getObjectList().add(object)

It's removed automatically when the instance closes.
2014-03-20 15:29:04 +00:00
Treeku 17fbb79ef0 Synchronization improvements for instances 2014-03-20 15:24:19 +00:00
Treeku 6412a8914a Fixed bug with previous buildout id change 2014-03-19 23:07:57 +00:00
Treeku 0948a68c3b Enabled heroic dungeons, fixed radials
getOptionType() seems to work now
2014-03-19 22:07:29 +00:00
Treeku 28da4fc620 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-19 20:40:56 +00:00
Treeku 69832cc30d Temp quadtree remove() fix 2014-03-19 20:37:37 +00:00
Treeku 9a100ee49f lookAtTarget (cursor) intendedTarget (target)
Updated target's position in the baseline.

The two unknown longs were the lookAtTarget (thing you cursor is
hovering over), which I believe probably comes before the actual target.

This could improve radial menus if the order is right, and allow them to
work even if you don't have the object targetted.
2014-03-19 20:36:43 +00:00
Waverunner 6cc9b9d60e Merge branch 'Wave_Entertainer' 2014-03-19 15:59:58 -04:00
Waverunner d210dc7ad7 Added posture checks, radial script for player objects, bug fixes
(Bug Fix) Must now wait before performing multiple flourishes
(Bug Fix) Can no longer propose to yourself (aka your hand)
(Bug Fix) Fixed some strings that didn't have variables
(Added) Posture checks before Skill Animating
(Added) Additional radial options show on players
2014-03-19 15:56:52 -04:00
Treeku 45426e576c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/ConnectionService.java
2014-03-19 19:50:13 +00:00
Treeku 0ef12787bb Instance implementation 2014-03-19 19:43:29 +00:00
Treeku 5df4b7c203 Made all callScript functions consistent 2014-03-19 18:26:15 +00:00
Treeku 604d1f7aef Changed duplicate id handling, static objids
- I noticed when targetting a client-spawned object (EK brazier), it
sent a target packet to the client with all 8 bytes filled, instead of
just the 4 stated in the buildout.  It seems the same 4 digits get added
to all buildout ids.  As a result, all buildout int-objectIds now have
the follow bytes added to them: FF FF 86 F9

Not sure about snapshot objects, but I imagine it's the same for them.

- I had to allow duplicate objects to be spawned in order for heroics
and instances to work.  It gives every duplicate object a new objectId
and also replaces the parentIds as well by storing the changes in a map
on each buildout area cycle.
2014-03-19 18:23:25 +00:00
Waverunner e0ca1ea7b2 Range check on performances for spectators 2014-03-17 16:49:50 -04:00
Waverunner 1801ac5cae Minor fix to packet being sent 2014-03-16 14:01:32 -04:00
Waverunner f14f656924 Fixed server errors, removed loading of space instances to save memory 2014-03-16 13:19:59 -04:00
Waverunner f2a162d565 Merge branch 'Wave_ImageDesign' 2014-03-16 13:04:30 -04:00
Waverunner 97f4db58d1 Buff Windows now close, changed formula used for stats on inspiration buffs, minor changes overall to entertainer 2014-03-16 13:01:30 -04:00
Levarrishawk c02d876bba Fixed additional recursion errors 2014-03-15 22:28:41 -04:00
Treeku 4130de20c6 Fixed ref 2 2014-03-16 01:25:44 +00:00
Treeku a9e794dd14 Fixed reference for prev 2014-03-16 01:18:59 +00:00
Treeku 84f7fe8ae5 Duels are ended when a client disconnects 2014-03-16 01:12:16 +00:00
Treeku d85bd44d7b Fixed error 2014-03-16 00:45:48 +00:00
Treeku 3f3d4e93fe Only medics and NPCs can heal others now 2014-03-16 00:29:34 +00:00
Treeku 3152ab021c No longer be able to heal duel opponent 2014-03-16 00:13:38 +00:00
Treeku d008f3fa37 giveExperience() takes account of XP bonuses 2014-03-15 19:52:17 +00:00
Waverunner fc35adbf78 ServerListResponse not sent on login anymore 2014-03-15 14:30:09 -04:00
Waverunner ca2401147d Added Server First request, changed how response allocates bytes 2014-03-15 13:50:36 -04:00