Commit Graph
93 Commits
Author SHA1 Message Date
Light2 760e9726a9 more work on conversations 2014-04-01 15:31:14 +02:00
Treeku 2ac9872498 Speedbuff fix moved from java to skillMod script 2014-03-31 17:29:10 +01:00
Light2 dc03c31276 fixed #337 and removed some lock contention 2014-03-31 01:18:52 +02:00
Waverunner f6bf134bad Fixed #266 and added stealth for GM 2014-03-29 20:08:21 -04:00
Waverunner 75f72fe7dc Fixed #314 2014-03-29 19:09:45 -04:00
Light2 4fe5e6614e temp fix for /pvp 2014-03-29 21:00:51 +01:00
Treeku 9ff669832b calculatePvpStatus() used for everything, more...
This ensures nothing is ever missed out of the pvpStatus calculation,
such as faction standing.  It should calculate the following:

On Leave/neutral players should be #16

Combatant players should be #35

Opposing faction SF players should be #55

Opposing Combatant NPCs should be #19

Ally SF NPCs (ie.; hoth commandos) should be #4

Enemy SF NPCs (ie. hoth resistance) should be #7

Same faction NPCs should be #0 (pink)

Attackable NPCs should be #1

Aggressive NPCs should be #2 or #3

NPCs you have negative faction standing with should be #2 or #3
2014-03-29 09:29:34 +00:00
Waverunner ac2f2e1e17 Put cast for calculatePvpStatus in CreatureObject 2014-03-28 22:05:38 -04:00
Treeku fac85f55d5 CreatureObject uses calculatePvpStatus() 2014-03-28 23:25:32 +00:00
Light2 397a35ebad fixed null pointer at disconnect 2014-03-28 20:36:11 +01:00
Seefo f9990a2bd5 Fixed some stuff 2014-03-28 07:09:16 -04:00
Seefo 1a0b36e8f3 Fixed #197, #250, and #233 2014-03-27 17:07:14 -04:00
Seefo 7970be3656 Fixed #126, updated git ignore list 2014-03-26 22:02:19 -04:00
Waverunner c31c24d7ec Remove print in stopPerformance 2014-03-26 20:16:33 -04:00
Waverunner d15b0d83e9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/EntertainmentService.java
2014-03-26 20:08:30 -04:00
Waverunner 66e29893ac Added holoemotes, work on imagedesign, bug fixes, new visitor class 2014-03-26 19:53:04 -04:00
Seefo e60ffb32c5 Fixed #245, also uncommented skill mod deltas 2014-03-26 19:20:05 -04:00
Light2 c3772e3246 Added xp gain on killing NPCs, fixed some bugs, added 2 new config options 2014-03-26 23:37:10 +01:00
Light2 d1a7f20177 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
	src/services/PlayerService.java
2014-03-25 20:14:16 +01:00
Light2 3e265ed6c5 some bug fixes, updated engine with support for new .trn versions, refactored some code with new Java 8 syntax, changed compiler to java 8 2014-03-25 20:08:01 +01:00
Waverunner c4093f215c Created new SkillMod class for SWGList, minor fix to Inspiration buff applying to self
Line 1181 in CreatureMessageBuilder needs to be uncommented. When it is,
after a couple skill mod delta's are sent, a crash occurs. I'm unsure on
how to fix it.
2014-03-24 16:25:37 -04:00
Waverunner 9b3d822bc4 Added /covercharge, p. effect abilities use highest effect for your level, bug fixes
(Added) Entertainers can now add Cover Charges for their performance
(Feature) Using a performance effect that has multiple effect levels
will use the highest effect for the entertainers level
(Code) Added 2 new methods (Jython and Java version) for Input Boxes
that automatically adds the input text to return list.
(Code) Moved essential spectating code from /watch script to
startSpectating
(BugFix) Fixed Null Error when trying to cancel Experience tick if
leveled with a cheat.
(BugFix) Fixed system messages error on performance abilities
2014-03-24 11:07:30 -04:00
Waverunner 0f390c063b No exp for entertainer above 90, fixed unity radial, changed giveItems 2014-03-23 15:59:29 -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
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
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
Treeku 28da4fc620 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-19 20:40:56 +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 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
Waverunner e0ca1ea7b2 Range check on performances for spectators 2014-03-17 16:49:50 -04:00
Light2 52136c2b36 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/protocol/swg/ObjControllerMessage.java
	src/resources/objects/player/PlayerMessageBuilder.java
	src/services/travel/TravelService.java
2014-03-10 00:42:19 +01:00
Light2 807025ec0b more work on AI, added odb for object id(should hopefully fix object id duplicates), fixed tons of bugs 2014-03-10 00:33:34 +01:00
Waverunner b08b7eaae7 Added proffessionWheelPosition delta, changed walkspeed, added skillmods 2014-03-08 18:10:27 -05:00
Treeku 5b0833f2ed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-14 22:00:16 +00:00
Treeku bdb626d4d1 Added baseline inheritance (delete ODBs) 2013-12-14 21:58:50 +00:00
Light2 896b342972 Fixed crash caused by buildings, fixed weapon object superclass, added equipment and appearance equipment deltas 2013-12-14 21:25:31 +01:00
Light2 140848e3ab Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-10 17:40:21 +01:00
Light2 4ffc7138c9 Updated engine 2013-12-10 17:37:20 +01:00
darkk1138 14f75cc1b4 dancers can now gain experience by performing flourishes
(calculations might still be off though. :p)
2013-12-09 22:54:21 +01:00
darkk1138 6177ed69f3 remove flawed field audience 2013-12-09 18:15:34 +01:00
darkk1138 760aea96f2 fix SWGList on audience, however, the old field needs removing.
depend inspire on watching
2013-12-09 18:09:40 +01:00
darkk1138 471fab10d8 refactored slightly.. wasted a lot of time with that. :p 2013-12-09 17:19:53 +01:00
darkk1138 a5b31ac5a5 add preliminary watch/stopwatching implementation 2013-12-09 16:04:33 +01:00
darkk1138 93ba62cd4f fix note bubbles for dance (both for starting and stopping) 2013-12-09 10:36:21 +01:00
darkk1138 3ec7223773 Merge branch 'darkk_login'
Conflicts:
	src/main/NGECore.java
2013-12-08 18:51:22 +01:00
Light2 f2200711cf Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/SimulationService.java
2013-12-08 18:21:50 +01:00
Light2 93195f7d5f Added dynamic lair spawns, fixed equip exploit, fixed some bugs and client crashes, updated engine 2013-12-08 18:17:01 +01:00
darkk1138 6471d7e118 add /groupdance command 2013-12-08 17:25:04 +01:00
darkk1138 9cefd424ce need object version change 2013-12-07 16:45:12 +01:00
darkk1138 131092de60 Merge branch 'master' into darkk_ent
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
2013-12-07 16:37:52 +01:00