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
Ziggeh
907cd9210f
Jedi - Added Force Drain
2014-03-29 20:07:34 +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
Waverunner
28edaec3ff
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-03-28 21:42:06 -04:00
Waverunner
1676324972
Fixed #285
...
Also added in owner ID delta as possible fix for characters showing as
sitting state
2014-03-28 21:41:57 -04:00
Seefo
20da16ace0
Decreased LD time before removal (5->1 min)
2014-03-28 21:22:42 -04:00
Seefo
39a9e78ef6
Temporary fix for #295
2014-03-28 21:20:11 -04:00
Treeku
9c30dbc695
Fixed expertise abilities
2014-03-29 00:19:20 +00:00
Treeku
fac85f55d5
CreatureObject uses calculatePvpStatus()
2014-03-28 23:25:32 +00:00
Treeku
aae66c8f11
calculatePvpStatus() returns 0 if no faction
2014-03-28 23:15:07 +00:00
Light2
d9c94f74fc
fixed client crash
2014-03-28 22:03:08 +01:00
Light2
397a35ebad
fixed null pointer at disconnect
2014-03-28 20:36:11 +01:00
Light2
f0a61f030d
Fixed ODB save error
2014-03-28 20:02:54 +01:00
Light2
9f859490f1
fixed(?) buffs/debuffs on npcs
2014-03-28 19:52:28 +01:00
Light2
2cc846eb29
fixed two errors
2014-03-28 19:49:12 +01:00
Light2
56141fae85
fixed armor reduction calculation
2014-03-28 19:44:35 +01:00
Light2
0ba6b372a2
Some AI fixes
2014-03-28 19:36:41 +01:00
Light2
932302d1e9
Refactored loading a bit to fix an issue where objects "steal" fixed client object ids before the client object can be loaded,fixed 2 errors
2014-03-28 18:22:21 +01:00
Treeku
1cd2a139db
Respec function
2014-03-28 14:49:12 +00:00
Seefo
4ae62f020c
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-03-28 10:32:23 -04:00
Seefo
52696dde04
Fixed removeSkill bug, read extended
...
Under certain circumstances, a skill would not be removed because of an
invalid skill mod being removed.
2014-03-28 10:31:53 -04:00
Treeku
90fb9bdf52
Minor cleanup
2014-03-28 14:24:28 +00:00
Seefo
6af78d3438
Fixed grantLevel some more, read extended
...
There seems to be a slight difference between the stats from using
giveExperience to get level 90 and grantLevel to get to 90.
2014-03-28 10:19:14 -04:00
Seefo
cb2655814a
Fixed some more stuff
2014-03-28 09:20:48 -04:00
Seefo
f9990a2bd5
Fixed some stuff
2014-03-28 07:09:16 -04:00
Treeku
ee071aa877
Fixed base skillMod bug in grantLevel
2014-03-28 03:39:38 +00:00
Treeku
1829ed0fe2
grantLevel fixes and checks
2014-03-28 03:06:39 +00:00
Seefo
2c6b23ab50
Small fixes for grantLevel and resetLevel
2014-03-27 22:51:43 -04:00
Treeku
8636835068
Fixed skillmod removal from resetLevel
2014-03-28 02:41:17 +00:00
Treeku
6a6e2ce138
Restored playerService (accidental delete)
2014-03-28 02:33:36 +00:00
Light2