projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity
1,213 Commits 11 Branches 4 Tags
2e21b1fb71fca4712e8fa3fb90b45fae0c609dc9
Commit Graph
255 Commits
Author SHA1 Message Date
Seefo 46c2c1bf2c Preliminary housing 2014-04-08 23:47:59 -04:00
Treeku b6045f85dc Added alias "afk" for "toggleawayfromkeyboard" 2014-04-07 09:29:19 +01:00
Waverunner 494bd4a8ad GMs can now get the accountId of the target (getplayerid) 2014-04-06 17:42:08 -04:00
Waverunner 730b446f02 Change holoemote cooldown to seconds 2014-04-06 14:42:02 -04:00
CharonInferar 348b6b7f55 Cleanup of options.cfg 
Used kneel py for spawning tools, replaced it with original
 2014-04-06 04:44:40 +02:00
CharonInferar e448a41bb0 Merge remote-tracking branch 'origin/master' into ResourceSpawn 
Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
	src/services/command/CommandService.java
 2014-04-06 03:59:55 +02:00
CharonInferar 065fe79945 Clean up of code 
Cleaned up some classes
Moved functionalities into more appropriate methods/classes
 2014-04-06 02:08:55 +02:00
Seefo d74bfae9c1 Fixed #378 2014-04-05 18:57:24 -04:00
Waverunner fe340f5930 Fixed #378: Drillmaster applied to target. 2014-04-05 18:45:16 -04:00
Ziggeh 710632fb87 Medic - Nutrient Injection mk. 1 now grants the correct buff 2014-04-05 08:02:24 +02:00
Ziggeh fbd3a3adeb Merge remote-tracking branch 'upstream/master' 2014-04-05 07:53:43 +02:00
Waverunner 9e80b5eeae Added basis for server-side cooldown checks, added warmup checks, closed #273 
Note that cooldown check is currently used only for the holoemote
command. To add a cooldown to any command, all you have to do is
CreatureObject.addCooldown(name). In this commit I also moved some
cooldown variables from CombatCommand to BaseSWGCommand since many
non-combat commands had cooldowns (Wookie Roar, Holo-Emotes). I also put
in a warmup cooldown (time before command is called) for non-combat
commands.
 2014-04-03 19:23:31 -04:00
Waverunner f042a133a1 Fixed #368 2014-04-03 15:12:09 -04:00
CharonInferar 531acac7c6 More quality assurance work 
- Resource container split/join
- Surveying test runs
- Balancing
 2014-04-02 23:28:08 +02:00
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
Waverunner 57922d6892 Fixed #336, Fixed #320, able to use basic dance 2014-04-01 17:26:46 -04:00
Seefo 515cb92ce7 Added option for buffs on items and wearables 2014-03-31 21:06:43 -04: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
Ziggeh 8c1dbc7d42 Medic - Fixed Nutrient Injection mk. 2 and 3 2014-03-31 01:25:26 +02: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
CharonInferar 4b2f15db05 Resource Spawn System 
Persistence to object database implemented
 2014-03-30 23:35:48 +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
Ziggeh bc2d3bb20f Merge remote-tracking branch 'upstream/master' 2014-03-30 21:30:16 +02:00
Light2andCharonInferar 6f8406e012 Added /teleporttarget GM command 2014-03-30 21:12:05 +02:00
SeefoandCharonInferar 1aeb991a8d Added customization variables 2014-03-30 21:12:04 +02: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
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 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
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
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
Light2 06c0df11c3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-28 00:57:58 +01:00