Commit Graph
3685 Commits
Author SHA1 Message Date
Treeku f7ed85af5a Cleaned up transferitemarmor. 2014-09-02 07:50:10 +01:00
Treeku 07d0926494 Cleaned up transferitemweapon. 2014-09-02 07:47:36 +01:00
Treeku 03089f1d6f Cleaned up transferitemmisc. 2014-09-02 07:44:58 +01:00
Treeku 90bd319359 Added isWearingAppearance() check. 2014-09-02 07:43:34 +01:00
Treeku 0592d4679a Added equipAppearance to equipmentService.
Various other improvements for potential issues.
2014-09-02 07:40:22 +01:00
Zing c235b97633 Merge pull request #1204 from zingzing175/experimental
Experimental
2014-09-01 22:49:38 -07:00
Zing d29e8379b3 Merge branch 'master' into experimental 2014-09-01 22:39:15 -07:00
Zing 47719ea5ad Merge branch 'experimental'
Conflicts:
	src/services/command/CommandService.java

merge conflict
2014-09-01 22:35:38 -07:00
Zing 65d48d9a42 Merge pull request #1202 from zingzing175/master
Fixed Appearance Item Client Crash. See notes
2014-09-01 22:24:40 -07:00
Zing 24da9f9f07 Fixed Appearance Item Crash. See notes
Currently multiple items can be assigned to the appearance item tab when
radial then equip appearance.
2014-09-01 18:14:34 -07:00
Waverunner 93c54874ba Fixed unknown Quest CRC error from prior commit 2014-09-01 16:45:49 -04:00
Waverunner 6e6221c771 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-09-01 16:27:00 -04:00
Waverunner 5026b9ee92 Added item count for retrieve tasks, Fixed wrong opcode for QuestAccept packet, Changed name of a couple methods in QuestService 2014-09-01 16:25:02 -04:00
Zing ec1731e32e Merge pull request #6 from ProjectSWGCore/master
Fixed cooldown issue potentially blocking commands
2014-09-01 12:10:07 -07:00
Treeku 0666a5f727 Fixed cooldown issue potentially blocking commands
Any object that inherits TangibleObject and has commands utilized on it will need to make sure their initAfterDBLoad() calls super.initAfterDBLoad().

Fixes:

java.lang.NullPointerException
at resources.objects.tangible.TangibleObject.hasCooldown(TangibleObject.java:626)
at services.command.CommandService.callCommand(CommandService.java:95)
at services.command.CommandService$1.handlePacket(CommandService.java:1011)
at engine.resources.service.NetworkDispatch$1.run(NetworkDispatch.java:202)
at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
at java.lang.Thread.run(Unknown Source)
2014-09-01 20:08:33 +01:00
Zing fdbde00ee4 Merge pull request #5 from ProjectSWGCore/master
pull
2014-09-01 11:49:58 -07:00
Treeku b0ada28769 Fixed potential client null with appearance items. 2014-09-01 19:46:29 +01:00
Treeku c32f2980dc Fixed potential client null with appearance items. 2014-09-01 19:44:43 +01:00
Treeku e770daeae8 Fixed a crash when removing.objects from SWGLists. 2014-09-01 19:26:08 +01:00
Treeku 12504fe320 Fixed issue where NPC weapon was equipped wrongly. 2014-09-01 02:19:12 +01:00
Zing 837723a55e Merge pull request #4 from ProjectSWGCore/master
pull
2014-08-30 07:58:17 -07:00
Ziggeh 4b03a7c34a Found an unknown in WEAO03 2014-08-28 16:43:10 +02:00
Treeku ea417cb7a5 Cleaned up Buff object 2014-08-28 07:36:33 +01:00
Treeku 5b280731c2 Fixed TangibleObject functions in CreatureObject 2014-08-28 05:40:46 +01:00
Waverunner 31a13ca32c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-27 20:25:03 -04:00
Waverunner 5cd90a4cec Added "Bib's Offer" Quest 2014-08-27 20:24:44 -04:00
Ziggeh 03da184111 Removed duplicate method from CreatureObject 2014-08-27 15:11:12 +02:00
Waverunner 3cad7bf212 Fixed waypoint not being destroyed for quests 2014-08-26 16:16:52 -04:00
Waverunner e7fa4f76eb Added complete_quest and reward task type handling, Changed task type to be split when quest loads instead of activating next task, Added getInventory method to CreatureObject, Added getQuestRewardTemplate to QuestService 2014-08-26 15:14:26 -04:00
Waverunner 9696bbd831 Merge branch 'feature/quests-tasks-and-cmds' 2014-08-26 12:46:26 -04:00
Waverunner 274e6a9926 Fixed some playerobject deltas not being sent correctly, Added quest acceptance window, Added /abadonquest, Fixed a few statement errors preventing zone in via character creation 2014-08-26 12:46:18 -04:00
Waverunner 7a891289db Fixed odb home directory error 2014-08-26 12:46:17 -04:00
Waverunner 16b9cafae3 Added handling for messagebox quest task types 2014-08-26 12:46:17 -04:00
Ziggeh d5d1443d71 Fixed LoginService PSQL nullpointers 2014-08-26 16:23:25 +02:00
Treeku e17b04a03c Merge pull request #1198 from ProjectSWGCore/CombatCommandRefactor
Combat command refactor preparation
2014-08-26 00:37:19 +01:00
Treeku 3fd74bf730 Minor changes 2014-08-26 00:33:20 +01:00
Treeku 2a0eff8163 Re-added reusableIdODB to NGECore.java 2014-08-25 23:53:53 +01:00
Treeku e30df01657 Merge remote-tracking branch 'origin/CombatCommandRefactor' into CombatCommandRefactor2
Conflicts:
	src/services/ai/AIActor.java
2014-08-25 23:31:16 +01:00
Treeku cdcfc98d1a Reverted NGECore.java temporarily 2014-08-25 23:05:28 +01:00
Waverunner fa874386b9 Merge branch 'feature/quest-conversations' 2014-08-25 17:46:36 -04:00
Waverunner 298fb1f59a Added quest completion window, Changed sui service to not need conversation npcs to need conversation radial attached, Changed goToLocation event to check all of players quests instead of active one 2014-08-25 17:44:22 -04:00
Treeku 727e679ebb Moved cooldowns to TangibleObject 2014-08-25 21:35:38 +01:00
Treeku 1dd7d712a3 Changed DOIds to be safer, added reusableIds
DOIds are still 100% needed for instances.

ReusableIds will be ideal for staticService and many other locations
where you know the object is only temporary to that session.
2014-08-25 21:24:23 +01:00
Treeku 326963f96e Removed more unnecessary command registrations 2014-08-25 20:13:04 +01:00
Treeku fca5feb467 Changed AI abilities to add to abilities list.
This allows the command system to recognise that they have the ability
in their abilities list.

Also removed setPvpBitmask which is redundant and unused; has no effect
on anything.
2014-08-25 20:08:29 +01:00
Treeku 4b7efcfc0f Removed unnecessary command registrations 2014-08-25 20:05:21 +01:00
Treeku 53227c6a00 Added hate to AI (distinct from damage).
Hate is not the same as damage.

AI is meant to choose their target based on who's most hated, not who's
dealt the most damage.

Hate is affected by the hate fields in combat commands, not necessarily
the damage of those commands.

An example is the Guardian Strike ability which deals zero damage but
increases hate greatly.

There is still a purpose for HighestDamageDealer in locations such as
DeathState where the person who gets the loot is the highest damage
dealer.  Damage dealt is also used in XP calculation.
2014-08-25 19:51:19 +01:00
Treeku cf65cc7901 Added datatables for CombatCommands 2014-08-25 19:46:56 +01:00
Treeku 2596cdc122 Added Math Utilities for CombatCommands 2014-08-25 19:43:35 +01:00
Lewis Morgan 1dc903a555 Merge pull request #1189 from ilikenwf/master
Database Fixes, Code Cleanups, Removal of Nested loops and if statements that are not necessary
2014-08-25 13:28:41 -04:00