Commit Graph
1684 Commits
Author SHA1 Message Date
Zing 47719ea5ad Merge branch 'experimental'
Conflicts:
	src/services/command/CommandService.java

merge conflict
2014-09-01 22:35:38 -07:00
Treeku 12504fe320 Fixed issue where NPC weapon was equipped wrongly. 2014-09-01 02:19:12 +01: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 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 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 3fd74bf730 Minor changes 2014-08-26 00:33:20 +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
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 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
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 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
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
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
Waverunner 409c6b4ab0 Added waypoints to retrieve item tasks 2014-08-22 16:08:53 -04: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 3d1f244f4d See extended...
- Fixed minor issue where bufferId was being set to the buffeeId.
2014-08-21 18:27:06 +01:00
Matt Parnell 0833e3f745 any time we call getResult, we likely re-parse the sql object. caching result item into a variable is more efficient 2014-08-20 23:32:23 -05:00
Matt Parnell 448ef2b2e6 sql fixes in char service 2014-08-20 23:31:01 -05:00
Matt Parnell d979f6e6e5 only select items from db we need, again 2014-08-20 23:27:57 -05:00
Matt Parnell e2bbc1b676 only select the bit we need 2014-08-20 23:26:43 -05:00
Matt Parnell 6a73772b1c copypasta mistake 2014-08-20 23:23:39 -05:00
Matt Parnell 86c972f7de sql cleanups - be verbose in our selections, always parameterize 2014-08-20 23:10:38 -05:00
Matt Parnell fcefe79ba0 remove unnecessary nested if 2014-08-18 23:04:19 -05:00
Matt Parnell 1f899f9851 fix some SQL issues where we were grabbing way too much data than we needed for our results 2014-08-18 23:02:58 -05:00
Matt Parnell f7512b27c3 replace use of select wildcard, which uses more DB resources with a call to count the number of characters an account has in CharacterService.java 2014-08-18 22:55:02 -05:00
Matt Parnell 9718715a17 comment on issue with reserved name filter - it just doesn't work. 2014-08-18 22:47:47 -05:00
Viaron 0498aceb0e Merge pull request #1179 from zingzing175/master
Fixed Some Admin commands not working on file systems other than windows. Added blocks to admin commands with godLevel of 0.
2014-08-17 21:34:42 -04:00
CharonInferar 557764bc50 Merge pull request #1180 from CharonInferar/Fixes2
Fixed AI-consideration in command service
2014-08-17 14:39:32 +02:00
CharonInferar cb6bbe37ea Removed debug messages 2014-08-17 14:35:17 +02:00
Waverunner ae9126ad75 Merge pull request #1178 from ProjectSWGCore/TacefEntertainer
Entertainermissions
2014-08-17 07:59:23 -04:00
CharonInferar 400a72eb7c Merge remote-tracking branch 'origin/master' into Fixes2 2014-08-17 13:30:28 +02:00
CharonInferar a52d01652c Fixed broken command service 2014-08-17 13:28:23 +02:00
Zing 6de085b3da Fixed Admin commands part2 2014-08-17 01:18:34 -07:00