Commit Graph
3634 Commits
Author SHA1 Message Date
Treeku 4bd294fb67 Enabled reusable IDs in StaticService 2014-08-26 00:40:02 +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
CharonInferar 770498a260 Merge pull request #1196 from CharonInferar/CorpseBuffFix
Fixed some corpses not despawning
2014-08-25 17:44:55 +02:00
CharonInferar 52c783a5ec Fixed some corpses not despawning
- For test purposes, NPC respawn has been activated now
- Fixed double respawn issue
2014-08-25 17:42:10 +02:00
R. Uvanni 538bb789d2 Equipment changes, see extended
Fixed an issue where attributes weren't being removed when unequipping
items.

EquipmentList and ApperaranceList are currently broken and will cause
crashes when modified, thus when equipping an item in any way will cause
a crash.  Expect a fix for that from Treeku shortly.
2014-08-24 22:57:13 -04:00
CharonInferar a2f1eabcbf Merge pull request #1195 from CharonInferar/CorpseBuffFix
Fixed client crash when buffs clear on corpse
2014-08-25 00:36:44 +02:00
CharonInferar 55c5219dd0 Fixed client crash when buffs clear on corpse
Corpse despawn now
Patrolling NPCs dont despawn, still fixing it
2014-08-25 00:33:51 +02:00
Waverunner 1190e7b1fe Added quest signal scrpts, Added Pall conversation 2014-08-24 15:07:37 -04:00
Waverunner a0d5a85aca Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-24 11:48:55 -04:00
Waverunner 8454027968 Changed go to location tasks to not need a script 2014-08-24 11:48:23 -04:00
Treeku 65d0cb65bf Changed NPCs to clear their debuffs upon death. 2014-08-24 07:48:02 +01:00
Matt Parnell 2b25931bd8 Merge remote-tracking branch 'upstream/master' 2014-08-24 00:38:37 -05:00
Treeku b218680d46 Fixed minor visual bug with buffs from frog. 2014-08-24 02:41:13 +01:00
CharonInferar a06d4c3f87 Merge pull request #1193 from CharonInferar/MoreFix
Fixed Incap weaken immortality bug
2014-08-24 03:21:10 +02:00
CharonInferar 7ff3c5a0d8 Added cell-relative AI patrol motion
- Replaced unnecessarily complex algebraic matrix expression
2014-08-24 03:14:09 +02:00
CharonInferar 8c0f7fcb52 Fixed Incap weaken immortality bug 2014-08-24 03:13:08 +02:00
Treeku 918520052b Fixed issue where you couldn't remove your buffs.
Fixes:

Traceback (most recent call last):
File "scripts/commands/removebuff.py", line 8, in run
buffObj = actor.getBuffByCRC(int(commandString))
AttributeError: 'resources.objects.creature.CreatureObject' object has no attribute 'getBuffByCRC'
2014-08-24 02:00:43 +01:00
Waverunner d4a298ed8c Merge branch 'feature/qtask-timers-location' 2014-08-23 16:52:57 -04:00
Waverunner 1c49296287 Added quest events, Added goTo task types, Changed activation of next steps to go through completeActiveTask 2014-08-23 16:44:23 -04:00
Lewis Morgan 7581b66c78 Merge pull request #1188 from Undercova/master
Merge
2014-08-23 14:55:47 -04:00
Lewis Morgan 49d493633a Merge pull request #1191 from Waverunner/master
Added waypoints to retrieve item tasks
2014-08-23 09:29:56 -04:00
Waverunner 409c6b4ab0 Added waypoints to retrieve item tasks 2014-08-22 16:08:53 -04:00
Treeku 8375302192 Fixed minor error with defendersList on reboot.
Fixes:

java.lang.NullPointerException
at resources.objects.tangible.TangibleObject.getDefendersList(TangibleObject.java:328)
at services.gcw.FactionService.calculatePvpStatus(FactionService.java:318)
at resources.objects.creature.CreatureObject.sendBaselines(CreatureObject.java:1475)
at engine.resources.objects.SWGObject.makeAware(SWGObject.java:532)
at services.SimulationService.add(SimulationService.java:251)
at services.SimulationService.handleZoneIn(SimulationService.java:1187)
at services.object.ObjectService$7.handlePacket(ObjectService.java:1169)
at engine.resources.service.NetworkDispatch$1.run(NetworkDispatch.java:216)
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-08-22 19:36:34 +01:00
Treeku 6fef627ace Merge pull request #1190 from Treeku/patch-1
Fixed issue where non-player couldn't be buffed.
2014-08-22 17:52:14 +01:00
Treeku a54dc11cb6 (Minor) Removed redundant file. 2014-08-22 13:54:57 +01:00
Treeku 959e3e3b1f Fixed issue where non-player couldn't be buffed. 2014-08-22 13:39:50 +01:00
Matt Parnell 96c46338b4 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/resources/buffs/Buff.java
2014-08-21 20:02:19 -05:00
Treeku eaf6e7511c Minor addition to last commit. 2014-08-21 21:15:40 +01:00
Treeku 50cfb10673 See update notes...
- Changed Buffs to track the buff giver as well as the buff receiver.
- Fixed some potential buff time issues.
2014-08-21 21:11:23 +01:00
Waverunner fd45b39356 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
# By Treeku
# Via Treeku
* 'master' of https://github.com/ProjectSWGCore/NGECore2:
  Fixed some long-term buff issues.
2014-08-21 14:08:41 -04:00
Waverunner 6847b99035 Fixed missing parentheses in Buff.java ternary cast 2014-08-21 14:07:13 -04:00
Treeku 73eebd1d06 Fixed some long-term buff issues.
We've had a completely incorrect buff structure in baselines for the last year due to some small misinterpretations of its structure.  It worked because there was the right amount of bytes, but otherwise the structure wasn't right and variables have been in the wrong place.  Specifically, we interpreted the stack variable (which comes last) to be the beginning of all buffs except the first, assumed there was an abnormal starting buff, and treated the final stack variable as an unknown variable that comes after the buff list.  This is most likely also why it didn't work without this "default buff".  The structure has been correct in Buff.getBytes() and buff deltas for a while but has been incorrect for baselines.
2014-08-21 18:56:23 +01:00
Treeku 3d1f244f4d See extended...
- Fixed minor issue where bufferId was being set to the buffeeId.
2014-08-21 18:27:06 +01:00
Treeku 499411f77d Minor buff adjustment 2014-08-21 17:47:30 +01:00
Bronco69 c7653dec56 Removed double entry of command in accesslevels 2014-08-21 16:24:41 +02:00
Bronco69 65dd82f4ac Fixed typo error in accesslevels and sorted command list 2014-08-21 15:58:11 +02:00