Commit Graph
71 Commits
Author SHA1 Message Date
Treeku bcbcbde34a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/objects/tangible/TangibleObject.java
2014-04-18 21:29:57 +01: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
CharonInferar 4f60260e53 Menu functionality improved
Lootkit implemented
Loot price and further stats considered
2014-04-18 20:57:56 +02:00
Treeku f58b7b6a5b Overhauled Mounts (still buggy) 2014-04-18 19:09:45 +01:00
CharonInferar 2b4527e165 Conversation menu improvements
SUI window functionality
storage of items in collections
2014-04-18 04:45:12 +02:00
CharonInferar d123415605 Improvements on loot system
Loot icon
Loot system messages
2014-04-16 18:14:10 +02:00
CharonInferar e3ed8a1ab6 Loot window added
Loot window implemented
Loot info effect added
2014-04-16 18:14:09 +02:00
CharonInferar b36081e630 Improvements on loot system
Loot icon
Loot system messages
2014-04-16 17:18:59 +02:00
CharonInferar 37dc1a45c2 Loot window added
Loot window implemented
Loot info effect added
2014-04-16 05:23:30 +02:00
CharonInferar 35383e0cf5 someone changed serial number data type 2014-04-14 19:58:46 +02:00
CharonInferar 83b701c01e more preparations
Preparations for crafting
2014-04-14 19:58:45 +02:00
CharonInferar cbaf74a92e first commit of addidtions 2014-04-14 19:58:44 +02:00
Treeku db3f0368a0 Items now have cooldowns and play anims
Grenades, heal stims, heavy weapons.

Heavy weapons seem to be considered usable items and it calls the heavy
weapon command dependent on the template in template_command_mapping.

You can't fire it from the toolbar due to a checkbox.
2014-04-14 11:55:40 +01:00
Treeku db33827e18 Setting serial sets SERIAL option to true 2014-04-14 11:02:00 +01:00
Treeku 7cee1990b5 Serial number uses attribute 2014-04-13 16:33:18 +01:00
Treeku 432700ab20 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 13:19:57 +01:00
Treeku 33614f4c48 Moved factionStatus from CREO to TANO 2014-04-13 11:06:27 +01:00
CharonInferar 5331cd67dc Increased TANO persistence version fix 2014-04-13 05:05:18 +02:00
CharonInferar fa00c85290 Swoop is mountable for further tests 2014-04-13 03:50:45 +02:00
Treeku 60972655dd Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/command/CommandService.java
	src/services/object/ObjectService.java
2014-04-13 00:49:58 +01:00
Treeku eeb1ea54af Flytext, System, Comms now use ProsePackages 2014-04-13 00:27:02 +01:00
Light2 5510ace39a fixed #411 2014-04-13 00:19:47 +02:00
CharonInferar ebe705f338 Merge remote-tracking branch 'origin/master' into LootSystem 2014-04-10 18:51:02 +02:00
CharonInferar 2e21b1fb71 Clean up
Cleaned up classes
Moved loot radial to death state
2014-04-10 17:49:47 +02:00
CharonInferar 4bb055ca19 Rare loot system stage added
Rare loot system stage in effect for every loot session.
Added legendary,exceptional,rare loot chests
2014-04-10 17:04:52 +02:00
Treeku e91362a12f Fixed most warnings 2014-04-10 11:52:09 +01:00
CharonInferar 221f9a93fc Loot radial and power crystal items
Connected loot radial to corpse. Made powercrystal scripts.
Allowed the mobile scripts to drop loot now.
2014-04-10 04:22:54 +02:00
CharonInferar 4d264f8c8a Refined the loot system
Added more py scripts for krayt pearls and junk
Made system more flexible
2014-04-09 04:57:26 +02:00
CharonInferar 70964ef14a Lootpool scripts added
Data transfer from py script to java
2014-04-08 15:39:48 +02:00
CharonInferar d848e89edb Script integration
A few example .py scripts
Improvements on the lootservice design
2014-04-08 04:08:52 +02:00
CharonInferar 9526eee9d6 Object-orientated approach to storing the loot info 2014-04-08 02:12:36 +02:00
CharonInferar 06fe72e647 Implementation of LootService
First steps
2014-04-07 23:49:51 +02:00
Seefo 248d325c6b Added customization variables 2014-03-30 14:18:48 -04:00
Light2 4fe5e6614e temp fix for /pvp 2014-03-29 21:00:51 +01:00
Seefo 01ffdb3c42 Fixed healing of AI, temp fix for faction error 2014-03-29 11:59:19 -04: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
Seefo f9990a2bd5 Fixed some stuff 2014-03-28 07:09:16 -04:00
Waverunner b9ed655f53 Refactored Starter Clothing, Added CustomizationDelta, basework for Image Design
(Bug) Fixed hair and items on char create not being added to equip list
(Code) Minor change to BuffBuilderMessage
(Code) Added base work for Image Design
(Code) Refactored how starter clothing is assigned
(Code) Added delta for customization data on tangible objects
(Code) Created ProfessionTemplateVisitor for profession template iff's
2014-03-25 22:06:38 -04:00
Waverunner 0f390c063b No exp for entertainer above 90, fixed unity radial, changed giveItems 2014-03-23 15:59:29 -04:00
Waverunner ffc9aec1b1 Added Inspiration ticks, effects for Multi-Tier Performance Abilities
(BugFix) Build-A-Buff applies correct stats now
-- NOTE: Stats that the player does not have yet may not show in
character sheet but the server will recognize still recognize their new
stats
(Added) Inspiration Ticks
(BugFix) Inspiration Buffs time corresponds to the players inspiration
ticks.
(BugFix) "Watch" on radial menu working again
(Added) Put in the effects for the multi-tiered performance abilities
(Feature) You can now type /[performance effect] [tier number] to use
that specific effect
(BugFix) showFlyText boolean for showing to observers or not (fixes
other players exp gain shown to other players)
(Code) Few minor additions/fixes
2014-03-22 11:47:37 -04:00
Light2 52136c2b36 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/protocol/swg/ObjControllerMessage.java
	src/resources/objects/player/PlayerMessageBuilder.java
	src/services/travel/TravelService.java
2014-03-10 00:42:19 +01:00
Light2 807025ec0b more work on AI, added odb for object id(should hopefully fix object id duplicates), fixed tons of bugs 2014-03-10 00:33:34 +01:00
Treeku 0ec2ace30d customName delta for TANOs (2) 2014-02-15 09:01:32 +00:00
Treeku 02328a0c73 customName delta for TANOs (1) 2014-02-15 08:58:08 +00:00
Light2 e8da49a12f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-28 19:17:41 +01:00
Light2 acf78858a6 some bug fixes + updated engine with networking fixes 2013-12-28 19:16:51 +01:00
Treeku fb0de037f0 GetOption() 2013-12-22 23:01:23 +00:00
Treeku 79e8b2507a Removed BaseObject (delete ODB again) 2013-12-14 23:25:15 +00:00
Treeku 5b0833f2ed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-14 22:00:16 +00:00
Treeku bdb626d4d1 Added baseline inheritance (delete ODBs) 2013-12-14 21:58:50 +00:00