Commit Graph
121 Commits
Author SHA1 Message Date
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
Treeku 231a476441 Fixed some merge issues with creature refactor. 2014-08-16 23:02:01 +01:00
Treeku e5d4a633bf Merge remote-tracking branch 'origin/master' into CreatureObjectRefactor
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
	src/services/PlayerService.java
	src/services/ai/AIActor.java
	src/services/ai/states/AttackState.java
2014-08-16 22:19:19 +01:00
Treeku 0175a6716e Refactored CreatureObject 2014-08-16 20:35:06 +01:00
CharonInferar 30b521c8bf Cleaned up classes 2014-08-10 15:17:01 +02:00
CharonInferar 5981efda9f Added more content, tweaked AI resources and buffs
- Added invasion-specific buffs
- Added factional handling
- Added AI switches
- Added construction/repairing
- Fixed enemy TANO color when changing status
- Fixed notification baselines to consider GCW-specific circumstances
- Optimized AI algorithmic complexity by eliminating expensive
arithmetic operations
- Fixed reposition state to avoid locations in water
- Considered tower defense buff for NPCs in combat service
- Compacted 3 AI threads into one
- Dynamic allocation of AI resources depending on patrol point index and
same faction AI density
- Added Withdrawal state for more realistic post-battle behaviour
- Positioned all pylons, camps, officers, terminals, barricades,
turrets, towers, cloners in the appropriate coordinates
2014-08-02 00:06:22 +02:00
CharonInferar 4fe9270a69 Added invasion NPCs, debugged AI lockups and more
- Added barrier and tower plus the according buffs
- Added defender NPCs
- Fixed enemy NPCs not showing hostile after faction change
- Added ally function implementation to rebel and imperial scripts
- AI does not lock up in a state anymore
- AI seeks better position if LOS is blocked
- AI resumes previous states better now
2014-07-22 23:46:17 +02:00
CharonInferar db036574b7 Added TurretAI
- Added vehicles
- Tweaked AI to consider opposite faction-aligned Installationobjects
enemies
- Added turret shooting at NPCs
- Debugged actors
2014-07-16 16:52:36 +02:00
CharonInferar 6d91b28eb9 Fixed #0000063
- Fixed: Incap timer reset to 10s
-Fixed NPC AI not deathblowing when it should
- Added: NPCs now engage factional enemies
2014-07-12 03:04:32 +02:00
CharonInferar 3cf0f610e9 Fixed several AI bugs, listed in description
Fixed #0000061 : Houses can now be destroyed, even when not redeeding
- Added AI action regeneration when in combat
- Fixed NPC self-buffing null pointer exception
2014-07-11 23:17:08 +02:00
CharonInferar 81a811a425 Fixed several AI bugs, added log system
- Fixes 0000031: Incap is not working correctly
- NPC AI now considers deathblow values correctly
- AI state transition further debugged
- Pet now follows owner after killing attacker
- Added debug log system
- Cleaned up system console from system.out messages
2014-07-06 23:47:56 +02:00
CharonInferar 0e33ad7c22 Added 2 Pets for AI Tests
- Added Follow State to AI
- Pets get attacked by enemies and do attack damaging enemies
- Some QA fixes
2014-06-29 16:51:35 +02:00
Treeku a5933c2db6 Fixed null error when NPCs use combat cmd 2014-06-18 08:56:54 +01:00
Treeku 97af15a747 Added try-catches to schedulers to identify errors 2014-06-18 08:06:27 +01:00
Treeku 0748d34dbe Fixed error when NPCs heal 2014-06-18 03:05:13 +01:00
Seefo c444117525 Fixed an issue where corpses wouldn't despawn 2014-06-04 22:50:30 -04:00
Waverunner 6d28ac9cd5 Fixed mission strings, fixed multiple bounty hunting bugs, added stacks for tracking droids from CBT
Fixed bugs for BHing include:
Bounty not being removed from bountyMap (they were still removed from
the db though)
Bounty success/defeat messages were wrong
Seeker not being destroyed from world
Completing bounty mission would not remove it from log (Allowing you to
keep on killing the player and potentially collecting the reward)
Fixed conversation messages on Arakyd Droid to use new ProsePackage
format
2014-05-26 18:58:16 -04:00
Treeku 1e864be3f1 Added gcw award for pvp 2014-05-19 16:28:14 +01:00
Treeku 8390234880 Merge pull request #674 from Ziggeh/master
Minor CombatService enhancement
2014-05-17 09:49:55 +01:00
Ziggeh c07454533b Minor changes to CombatService 2014-05-16 15:29:40 +02:00
Treeku c2806c4ceb Updated java src files to diff prose constructor 2014-05-16 10:21:42 +01:00
Treeku 865db149ad Fixed loads of warnings 2014-05-14 15:51:25 +01:00
Waverunner b5344eab07 Added bindLocation variable, clone location shows bind spot in yellow, fixed incap and db messages 2014-05-10 16:38:59 -04:00
Waverunner 892f9cb7db Bounty mark will enter combat now if attacked, entering combat will now break stealth 2014-05-06 20:34:35 -04:00
Seefo ae728fc39a Fixed an issue where creatures wouldn't be dismounted upon incapacitation (#613) 2014-05-05 13:04:59 -04:00
Waverunner db80ef2d7c Credits given on completion of bounty mission, added cap for bounties, can no longer take your own bounty 2014-05-04 12:39:44 -04:00
Waverunner 4831f6d8ca Added handling of deathblow for bounties 2014-05-03 20:04:27 -04:00
Treeku 4b6a7e3667 Added TEFs 2014-05-01 12:33:34 +01:00
Waverunner ea9a1fdd82 Added setting of player bounties
Mission for bounties still needs to be ironed out so you won't see them
in the bounty mission terminal, however you can now set bounties for
players.
2014-04-29 17:49:03 -04:00
Treeku 02ff93312e Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	scripts/houses/player_house_corellia_large_style_01.py
	scripts/houses/player_house_corellia_large_style_02.py
	src/resources/objects/tangible/Deed.java
	src/resources/objects/tangible/Harvester_Deed.java
	src/resources/objects/tangible/Player_House_Deed.java
	src/services/PlayerService.java
	src/services/object/ObjectService.java
2014-04-29 05:04:23 +01:00
Treeku 985cd6b779 Moved buff and skillmod objects 2014-04-29 03:56:52 +01:00
Waverunner b0e2a490f6 Changes to MissionObjective, started working on player bounties 2014-04-28 17:37:23 -04:00
Ziggeh 9b6127402d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-19 15:15:21 +02:00
Treeku e8a1959f9d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	scripts/radial/vehicle.py
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/SimulationService.java
	src/services/combat/CombatService.java
	src/services/object/ObjectService.java
2014-04-18 21:10:53 +01:00
Treeku f58b7b6a5b Overhauled Mounts (still buggy) 2014-04-18 19:09:45 +01:00
Ziggeh a65c3d6966 Combat - Added Ranged and Melee Glancing Blow 2014-04-18 01:16:06 +02:00
Ziggeh 7f796d211e Created HitType datatable and removed unused code 2014-04-17 12:47:48 +02:00
Waverunner 857198f32d Merge pull request #462 from Ziggeh/master
Weapon particle effects, misc enhancements
2014-04-16 19:02:10 -04:00
Waverunner da20b779cf Temporarily Fixes #442: Position secured cant be removed
The problem related to doSelfBuff always calling and thinking that the
position secured buff wanted to be added all the time, which isn't the
case. Right now I added a hasBuff check to doSelfBuff for the position
secured buff which will remove the buff. I didn't want to flat out just
remove a buff no matter what command was called because that would
affect any buffs that wanted to be refreshed and not removed.
2014-04-16 18:51:32 -04:00
Ziggeh a998b3ec44 Cleaned up CombatService and fixed buff exceptions 2014-04-17 00:46:00 +02:00
Treeku b436353904 godLevel is now set and used 2014-04-13 13:17:23 +01:00
Seefo 0eab2ff8c9 Fixed an issue where killing an NPC did not set you as the killer object 2014-04-10 17:38:37 -04:00
Treeku e91362a12f Fixed most warnings 2014-04-10 11:52:09 +01:00
Treeku 351910c04a Various command bugfixes 2014-04-10 10:18:20 +01:00
Waverunner d5c9d226e3 Fixed #255: Evasion not exiting combat 2014-04-07 16:22:36 -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
Seefo 6d96545dd9 #283 should be fixed 2014-03-29 19:31:13 -04:00
Light2 e7cf35d749 Merge pull request #302 from Ziggeh/master
CombatService - Added method for drain heals
2014-03-29 20:04:32 +01:00