Commit Graph
366 Commits
Author SHA1 Message Date
Ziggeh d2da758fdb Weapons - Fixed #446 2014-04-16 18:14:08 +02:00
Ziggeh d85183165f Weapons - getDamageType() now returns a cleaner string 2014-04-16 18:14:07 +02:00
Light2 0ec275cf7b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/bazaar/BazaarService.java
2014-04-15 01:12:44 +02:00
Light2 bd0a30aa96 Added basic bazaar functionality - see extended
Categories are not working right now, Auctions and Vendors are not yet
implemented
2014-04-15 01:11:33 +02:00
Treeku 9f75c370ab Merge pull request #424 from Ziggeh/master
Refactored WeaponObject
2014-04-14 16:34:55 +01:00
CharonInferar 0c1aebb58a someone changed serial number data type 2014-04-13 23:12:32 +02:00
CharonInferar 7091c4bbb3 more preparations
Preparations for crafting
2014-04-13 22:59:31 +02:00
CharonInferar afcec36cc1 second commit 2014-04-13 22:46:02 +02:00
CharonInferar 1decfaa081 first commit of addidtions 2014-04-13 22:29:02 +02:00
Treeku b968b9ad1f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 19:41:33 +01:00
Seefo 1b1294136a Fixed a bunch of vehicle bugs - will probably change the way vehicles are being handled soon to account for other vehicle templates 2014-04-13 13:37:54 -04:00
Ziggeh 1fa24af10f Merge remote-tracking branch 'upstream/master' 2014-04-13 19:17:23 +02:00
Ziggeh cbefc25121 Refactored WeaponObject
The scripting of weapons should be much, much easier now. See the
included examples in DevService.

Attributes such as attack speed and range are now being read/written to
the actual items attributes.
2014-04-13 19:15:17 +02:00
Treeku 7cee1990b5 Serial number uses attribute 2014-04-13 16:33:18 +01:00
Light2 cf9bcf66f9 Fixed vehicles 2014-04-13 17:17:25 +02:00
Treeku 432700ab20 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 13:19:57 +01:00
Treeku b436353904 godLevel is now set and used 2014-04-13 13:17:23 +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 03c5201cf4 Command fixes, command removing 2014-04-13 00:29:30 +01:00
Treeku eeb1ea54af Flytext, System, Comms now use ProsePackages 2014-04-13 00:27:02 +01:00
Light2 83aa0ab2b0 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 00:20:00 +02:00
Light2 5510ace39a fixed #411 2014-04-13 00:19:47 +02:00
Seefo 6f791819e6 Fixed some housing bugs and Tusken Raider mobile template - see extended
Fixed a housing issue where the structure management terminal would be
returned in the item list and could be deleted via the delete all items
radial.

Fixed item list to display proper names of objects.

Fixed the Tusken Raider mobile template to display the proper creature
name and changed their default weapons from an E11 and a T21 to a Tusken
Rifle.
2014-04-12 18:13:11 -04:00
Light2 e144118364 more cleanup + fixes
Harvesters and house terminal work now
2014-04-12 18:31:37 +02:00
Light2 c5520abff8 Cleanup + persistence fix 2014-04-12 17:19:52 +02:00
CharonInferar 090a15de84 Merge remote-tracking branch 'origin/master' into Housing 2014-04-12 02:47:01 +02:00
CharonInferar 7cd8d8d742 All structure terminal menus and functionalities implemented
Dropped items add nowto the buildings itemlist
Some databse work for permissions
2014-04-12 02:30:17 +02:00
Light2 e5ed3a356c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/main/NGECore.java
2014-04-11 23:53:15 +02:00
Light2 ea8bc53394 Started work on bazaar 2014-04-11 23:47:03 +02:00
CharonInferar 1ab23231f6 Structure terminal work
Creation of player_house_deed class
terminal menus made
py scripts arranged
2014-04-11 04:14:29 +02:00
CharonInferar a1370a9b60 Harvesters introduced
Working harvesters and generators
Big update
2014-04-11 02:25:07 +02:00
CharonInferar 646476c17d Harvesters introduced
Working harvesters and generators
Big update
2014-04-11 01:48:27 +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
Seefo 38283f3351 Added house radials and fixed a lot calculation mistake 2014-04-09 21:23:12 -04:00
Waverunner 931404bf3f Organized chat packets, disabled chat channels temporarily 2014-04-09 18:50:14 -04:00
CharonInferar abe8d6475f Merge remote-tracking branch 'origin/master' into LootSystem
Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
2014-04-10 00:38:13 +02:00
CharonInferar 118d622c6d More Junk, Krayt Pearls added
The System has been more generalized, but also deals with special cases
of Krayt Pearls/Power Crystals.
More itemscripts created
2014-04-09 21:16:28 +02:00
Seefo 8025bc7ad0 Changes to housing, added real player lot count to character sheet 2014-04-09 11:56:56 -04: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