Commit Graph
914 Commits
Author SHA1 Message Date
CharonInferar 604d066c0f Cleaned up Surveyservice
and give all survey tools from frog at once
2014-04-01 18:45:33 +02:00
CharonInferar 438017efcc ResourceMessenger removed 2014-04-01 16:26:35 +02:00
CharonInferar 5345e8c031 Work on bikes
Further work will be in another branch
2014-03-31 19:53:55 +02:00
CharonInferar e692120b8f Surveying debugging
Improved surveying
2014-03-31 19:50:02 +02:00
CharonInferar f4527d60f4 Radial dial malfunction fixed
reverted serialize() method in ObjectMenuResponse to old version
2014-03-31 01:30:07 +02:00
CharonInferar 4b2f15db05 Resource Spawn System
Persistence to object database implemented
2014-03-30 23:35:48 +02:00
Light2andCharonInferar 6f8406e012 Added /teleporttarget GM command 2014-03-30 21:12:05 +02:00
SeefoandCharonInferar c18c2c8d20 Added random lightsaber colours to frog 2014-03-30 21:12:04 +02:00
SeefoandCharonInferar 1aeb991a8d Added customization variables 2014-03-30 21:12:04 +02:00
Light2andCharonInferar de79b23e3c Small fix 2014-03-30 21:12:03 +02:00
Light2andCharonInferar d8c0b4f7df optimised collision detection 2014-03-30 21:12:03 +02:00
Seefo 8b4d7ae4da Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 20:21:10 -04:00
Seefo c71c4bf075 Added NPC stuff, read extended
Added a jedi_master npc, added support for custom weapons for creatures.
2014-03-29 20:20:57 -04:00
Waverunner 235ee34056 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 20:08:29 -04:00
Waverunner f6bf134bad Fixed #266 and added stealth for GM 2014-03-29 20:08:21 -04:00
Light2 2568c94b9a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-30 00:55:22 +01:00
Light2 a6d91379fe temp fix for /pvp bug, fixed null pointer on buffing ai 2014-03-30 00:54:09 +01:00
Seefo bad39e8fc3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 19:31:25 -04:00
Seefo 6d96545dd9 #283 should be fixed 2014-03-29 19:31:13 -04:00
Waverunner 4609a05780 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 19:09:53 -04:00
Waverunner 75f72fe7dc Fixed #314 2014-03-29 19:09:45 -04:00
Seefo 19e42e6e40 Fixed #293 (Flying AI) 2014-03-29 19:04:29 -04:00
Waverunner f9dfc0a766 Fixed #313 2014-03-29 18:36:31 -04:00
Waverunner 00d8f277f1 Cloning Window sent on zone-in if dead 2014-03-29 17:47:06 -04:00
Waverunner 352cc1cd5e Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 16:48:01 -04:00
Waverunner dfab6ac265 Fixed #308 and added foundation work for chat channels 2014-03-29 16:47:05 -04:00
Seefo 26053c7baa Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 16:11:21 -04:00
Seefo 85582bdd29 Fixed a trade bug and a /open bug 2014-03-29 16:11:10 -04:00
Light2 308c6c30d2 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 21:01:00 +01:00
Light2 4fe5e6614e temp fix for /pvp 2014-03-29 21:00:51 +01:00
Light2 e7cf35d749 Merge pull request #302 from Ziggeh/master
CombatService - Added method for drain heals
2014-03-29 20:04:32 +01:00
Ziggeh 3ad4aad96d Armor - Protection is added to character sheet 2014-03-29 19:48:07 +01:00
Seefo 8268359ec2 Reverted temporary fix for #295 b/c #295 is fixed 2014-03-29 14:09:54 -04:00
Seefo 7a75e5ef0b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 14:01:12 -04:00
Seefo 68ebfae145 Fixed expertise exploit 2014-03-29 14:01:00 -04:00
Light2 dce91cc2d2 reverted fix 2014-03-29 18:56:59 +01:00
Light2 7376be7b95 fixed bug where character wouldnt gain any abilities on using the frog to get lvl 90 2014-03-29 18:42:24 +01:00
Light2 dfd7f1e9a9 Fixed bug where group wouldnt show up when player loaded a new scene 2014-03-29 18:32:29 +01:00
Light2 c8600fe6e1 fixed concurrency error 2014-03-29 18:21:05 +01:00
Light2 7878e2a589 fixed bug where revive window was showing up for the medic 2014-03-29 18:19:59 +01:00
Light2 b930a66573 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 17:35:44 +01:00
Light2 d7784f4d25 Added exception handling for AI 2014-03-29 17:35:31 +01:00
Ziggeh 21149a55af Merge remote-tracking branch 'upstream/master' 2014-03-29 17:00:09 +01:00
Seefo 01ffdb3c42 Fixed healing of AI, temp fix for faction error 2014-03-29 11:59:19 -04:00
Ziggeh 5ea7a1497d Merge remote-tracking branch 'upstream/master' 2014-03-29 14:17:58 +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
Ziggeh e39b6b498d CombatService - Added method for drain heals
run() in the combat ability scripts now take the damage done post
mitigation etc as an argument instead of null.
2014-03-29 06:52:03 +01:00
Treeku 73bef32efb Player flag is set when you align to a faction ->
When you join a faction, #16 is set to true.

When you go combatant, #32 is set to true.  The resulting flag: 48

When you go SF, #1, #2 and #4 are set to true.  The resulting flag: 55

When you go back to combatant, #1, #2 and #4 are set to false.  The resulting flag: 48

The error was either in the Player flag not being set anywhere, or setPvpStatus setting it instead of doing OR/XOR operations.

(The result of this would be bit #16 wouldn't be set to true, meaning SF would be 39 instead of 55)

We could still set all of the flags to true for SF without harm for safety, it just wasn't theoretically necessary.

Additionally any players that login automatically were getting #16 sent to the client by sendBaselines() regardless of if they had a faction, which should now be fixed.
2014-03-29 03:15:04 +00:00
Waverunner ac2f2e1e17 Put cast for calculatePvpStatus in CreatureObject 2014-03-28 22:05:38 -04:00
Waverunner c33bbe291b Combat check before starting trading session 2014-03-28 21:57:00 -04:00