projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-30 00:15:57 -04:00
Code Issues Projects Releases Wiki Activity
971 Commits 11 Branches 4 Tags
e57cefd8a56f5fff15bd6c76b69dd82ef3ddab8a
Commit Graph
471 Commits
Author SHA1 Message Date
Light2 4c5ff93385 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-02 18:12:20 +02:00
Light2 b245efdce6 Finished NPC conversations, fixed disconnect bug, fixed AI atk speed check 2014-04-02 18:12:08 +02:00
Adonaii b76ca53e9f Added heroic jewelry scripts 
Added the scripts for all 3 sets of heroic jewelry buffs for both spy
and medic.
 2014-04-01 23:45:33 -04:00
Seefo 6d9ee65bf3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-01 17:36:29 -04:00
Seefo 37ca907584 Temporarily disabled actionPercent and healthPercent skillmods 2014-04-01 17:36:16 -04:00
Waverunner 57922d6892 Fixed #336, Fixed #320, able to use basic dance 2014-04-01 17:26:46 -04:00
Seefo 8b77a13cf3 Added set bonuses for 2 Jedi robes and Belt of Master Bodo Baas 2014-04-01 16:43:02 -04:00
Seefo 349eb33090 Added framework for bonus sets 2014-04-01 16:08:03 -04:00
Light2 98bed55d07 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-01 15:31:29 +02:00
Light2 760e9726a9 more work on conversations 2014-04-01 15:31:14 +02:00
Seefo 520fd566db Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-31 22:43:33 -04:00
Seefo e7761f7e45 Added actionPercent and healthPercent skillmods 2014-03-31 22:43:18 -04:00
Treeku e926507ea4 Removed structure trader, start work on guildbanks 2014-04-01 03:18:58 +01:00
Seefo f93a7b68db Added action skill mod 2014-03-31 22:03:39 -04:00
Seefo 515cb92ce7 Added option for buffs on items and wearables 2014-03-31 21:06:43 -04:00
Seefo 73b20381fe AI changes, added Stormtrooper and fixed creature names for Krettle, Chuba, and Womprat 2014-03-31 14:14:51 -04:00
Seefo 7969394bea Fixed movement skillmod 2014-03-31 12:44:53 -04:00
Treeku f8036f8f83 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-31 17:29:36 +01:00
Treeku 2ac9872498 Speedbuff fix moved from java to skillMod script 2014-03-31 17:29:10 +01:00
Seefo c3e784f76f Buffs now fallback on ... read extended 
Buffs now fallback onto buffs.iff if no script currently exists for the
buff.
 2014-03-31 12:26:03 -04:00
Levarrishawk a8c7882a3a Added framework for future custom content 
Added static spawns for future use on Dromund Kaas
 2014-03-31 03:01:42 -04:00
Light2 163525b02a fixed #318 2014-03-31 01:23:58 +02:00
Light2 8dca7cc66a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-31 01:18:59 +02:00
Light2 dc03c31276 fixed #337 and removed some lock contention 2014-03-31 01:18:52 +02:00
Waverunner 97109d6e71 Merge pull request #321 from Ziggeh/master 
Jedi - Added Force Drain
 2014-03-30 16:37:59 -04:00
Waverunner f0c132e035 Merge pull request #324 from Doogla/master 
Added Abilities and Bug Fixes
 2014-03-30 16:37:29 -04:00
Seefo 86fd82c5a8 Added command to change customization of objs 2014-03-30 16:23:29 -04:00
Light2 6c1df547b4 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-30 21:02:57 +02:00
Light2 7bb65bb0bf Added /teleporttarget GM command 2014-03-30 21:02:45 +02:00
Seefo 248d325c6b Added customization variables 2014-03-30 14:18:48 -04:00
Doogla 6d53f8a8f3 Added Abilities and Bug Fixes 
Fixed Jedi Stance

Fixed BH Sprint

Added BH Shields (not fully working yet)

Fixed an error on Commando Pinpoint Shielding Tree
 2014-03-30 05:00:44 -07: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
Ziggeh 6a3160b72b Merge remote-tracking branch 'upstream/master' 2014-03-30 00:22:14 +01:00
Waverunner 75f72fe7dc Fixed #314 2014-03-29 19:09:45 -04:00
Waverunner f9dfc0a766 Fixed #313 2014-03-29 18:36:31 -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
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
Ziggeh 3ad4aad96d Armor - Protection is added to character sheet 2014-03-29 19:48:07 +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
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 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
Light2 0ba6b372a2 Some AI fixes 2014-03-28 19:36:41 +01:00