Commit Graph
215 Commits
Author SHA1 Message Date
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
darkk1138 9683f4c164 add startdance, stopdance, flourish and bandflourish commands 2013-12-07 16:34:19 +01:00
Ziggeh 805ef52f73 Soothing Aura for LSJ
This expertise now functions as intended.
2013-12-07 05:11:52 +01:00
Ziggeh 14fece35b6 Fixed incorrect math (Healing Potency)
Healing Potency now functions properly.
2013-12-07 04:28:11 +01:00
Ziggeh aa0fe46fba Fixed Supply Drop command for officers.
The Tactical Supply Drop command was removed from the game and was
merged with the Medical Supply Drop and then became Supply Drop.

The script can properly check if the actor has the tactical serum
expertise box or not.
2013-12-06 23:21:31 +01:00
Treeku 23731091c8 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-06 12:15:32 +00:00
Treeku e94fc930ce FactionService, helper funcs, factionResponseMsg 2013-12-06 12:14:13 +00:00
Waverunner ff772a1f79 MissionObject Delta's added, Debug print to try and fix Travel Points showing on other planets 2013-12-05 18:48:58 -05:00
Light2 7af18344bc Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-05 17:33:43 +01:00
Light2 2c66ab67d8 More work on lairs 2013-12-05 17:33:26 +01:00
Treeku 3bb0d0534c setDifficulty(Difficulty.NORMAL/ELITE/BOSS) 2013-12-05 12:53:34 +00:00
Treeku 42fca91fa5 Objects with no radial file given default options 2013-12-05 05:22:06 +00:00
Treeku 82e513363e Fixed use() in object scripts. It should work now 2013-12-05 04:17:06 +00:00
Waverunner ca807ae5ae Added MissionObject Baselines, Waypoints can be added via Planetary Map now 2013-12-04 19:10:15 -05:00
darkk1138 c4dc69fd92 Merge branch 'master' into darkk_ent 2013-12-04 22:43:41 +01:00
darkk1138 6bd1c7b02c temp commit before merge 2013-12-04 22:43:34 +01:00
Light2 470215c05d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/objects/tangible/TangibleObject.java
2013-12-04 19:13:08 +01:00
Light2 b22b1d818d More work on AI and spawns 2013-12-04 19:05:02 +01:00
Treeku d3d9dcc461 Fixed factonService ordering 2013-12-04 09:59:33 +00:00
Treeku bbf1c7c99d Added quick GM commands for QA
We can put permissions on these or whatever is needed later
2013-12-04 08:22:37 +00:00
Treeku 2bb9d4e42e Fixed minor PlayerObject persistent error 2013-12-04 03:43:07 +00:00
Treeku befd10c98f Condition attribute updates when condition is set 2013-12-03 22:47:18 +00:00
Treeku 8bfad21de1 Add buff callbacks (buff effcts can be removed)
If the buff as a callback field, define it as a function in the buff
script and do whatever it's supposed to do.  It uses the same params as
the other functions in there do.  For example:

def handleClearBuffEffect(core, actor, buff):
2013-12-03 22:32:38 +00:00
Treeku 9cbbc71e84 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/services/object/ObjectService.java
2013-12-03 17:02:35 +00:00
Treeku 0edf9610df Start of FactionStanding, Custom Object Scripts 2013-12-03 16:43:01 +00:00
Treeku 0809361349 PvP & OptionsBitmask refactor
These will need to be used in scripts to make NPCs invulnerable,
conversable, always aggressive, etc.
2013-12-03 16:29:17 +00:00
Light2 f8362d338b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-02 23:59:28 +01:00
Light2 30e1e1c8ec Added collidable areas which can trigger a script, started work on AI, fixed position secured, updated engine 2013-12-02 23:58:22 +01:00
Treeku 890e523ba4 Buffs should now play and stop effects automatically 2013-12-02 22:55:26 +00:00
Waverunner 4245bb120a Added Tactical Supply drops, fixed Ithorian clothing error, minor bug fixes and tweaks 2013-12-02 17:08:53 -05:00
Light2 6857bd562b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-01 19:40:41 +01:00
Light2 164ae97d82 Fixed error with conflicting object ids 2013-12-01 19:40:28 +01:00
darkk1138 cde8e11be5 grant species_* skills 2013-11-30 16:54:25 +01:00
darkk1138 2e3879321b temp commit for ent stuff 2013-11-30 12:32:19 +01:00
Waverunner f61b2f761a Added Ignore List & cleaned up code in TravelService 2013-11-27 10:28:02 -05:00
Light2 f2b156cb61 Added group buffs 2013-11-27 00:11:48 +01:00
Light2 3ee31a9825 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	scripts/static_travel_points.py
2013-11-26 22:31:08 +01:00
Light2 0a040424f6 Added loading of objects from datatables/buildout, added building and cell baseline packets, fixed crash on spawning of static objects....
...updated engine, added restuss shuttleport and theed starport spawns,
increased view range for large objects loaded from buildout datatables
like jabbas/theed palace etc.
2013-11-26 22:28:38 +01:00
Levarrishawk 9fd820b93d Commented out Kaas Entries
Commented out Dromund Kaas related entries for future use.
2013-11-26 07:34:18 -05:00
Levarrishawk e4ca21ca06 Added foundation for New Planets 2013-11-26 01:00:42 -05:00
Waverunner 4f94664584 Added ent skillmods, fixed attribute points in buff workshop 2013-11-25 17:00:32 -05:00
Light2 bb085477c4 Added Heal Over Time buffs, finished most of commando except kill meter and some abilities 2013-11-25 22:10:33 +01:00
Treeku a68e679ebb Weapon Objects now have "Volume: 1" attribute 2013-11-25 19:44:24 +00:00
Treeku 831ec2bced Tangible Objects now have "Volume: 1" attribute 2013-11-25 19:14:38 +00:00
Treeku de3d5f0ecf ShowFlyText has customText (ie. for ent ticks) 2013-11-25 19:11:29 +00:00
Treeku ab75312e47 Added Collections 2013-11-25 16:20:33 +00:00
Light2 23aeb02249 Updated engine, added bank terminals to bank buildings 2013-11-25 16:29:01 +01:00
Light2 b2e560f989 Adjusted shuttle landing time 2013-11-25 00:11:39 +01:00
Light2 a089d6c590 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-11-25 00:09:58 +01:00