Commit Graph
317 Commits
Author SHA1 Message Date
Treeku 7f88fefe2e Fixed force run 2014-05-13 09:22:30 +01:00
Light2 b8927c9677 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-12 17:35:30 +02:00
Light2 119e58318c More work on vendors 2014-05-12 17:35:19 +02:00
Seefo c47ddf77df Fixed a container limit bug 2014-05-11 12:42:40 -04:00
Seefo 3218803ecb Updated lightsaber system messages, changed EquipmentService.canEquip to report why the actor cannot equip the item 2014-05-11 01:45:00 -04:00
Seefo d182fea6eb Loot System changes, see extended
* Added /setgodmode genloot <lootTemplate> command
* Added the option to have a 'custom setup' of a looted object template
(see scripts/loot/lootItems/veryrareloot/rare_ankarres_sapphire.py),
procedure is same as object scripts
* Looted items no longer need custom names in order to not have an empty
name (most scripts containing a custom name can now have that method
removed)
2014-05-07 22:11:18 -04:00
Seefo 2285378ad7 Fixed a bug where people could spam-equip items with bonus sets and obtain a bonus buff without wearing the required number of items 2014-05-07 22:08:20 -04:00
tacef ca5134bf13 Fixed Forcethrow exception 2014-05-07 21:54:16 +02:00
Seefo bd9db1c0c8 Added container limit checks 2014-05-06 18:40:19 -04:00
Waverunner 7b14c94d40 Fixed #621, added missing sys message for tracking droids, fixed bounties db null error & wp null error 2014-05-06 17:27:06 -04:00
Seefo f394dd6e19 Fixed loot system message, added functions to TangibleObject to obtain different variants of the object's name 2014-05-06 13:03:54 -04:00
Seefo b4d7b1c95a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-05 20:19:22 -04:00
Seefo 8dd5f5d053 Initial commit of lightsaber customization - see extended
The majority of lightsaber customization now works.

All that I can think of that needs to be done is:

* Rare/Unique color crystals names/palette index to
resources.datatables.LightsaberColors
* Weapon element types and damage bonus based on color crystal
* Random stats when tuning power crystals/krayt dragon pearls
* Checks to see if lightsaber is full - container size is in IFFs, we
should implement it for all containers
2014-05-05 20:19:07 -04:00
Light2 61bfc193ec Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-06 00:55:19 +02:00
Light2 ce15656ff3 begin work on vendors, fixed highestid sql query(might fix crash bug) 2014-05-06 00:55:02 +02:00
Treeku 70bd83a6f3 Merge pull request #609 from zingzing175/master
Fixed some commands not firing unless targeting self.
2014-05-05 02:06:41 +01:00
zingzing175 b532798a0c Fixed some commands not firing unless targeting self 2014-05-04 18:01:57 -07:00
CharonInferar fabeaed919 Armor loot fix, stat loot fix
fixed numeric errors
Loot client command response coded
2014-05-04 23:06:27 +02:00
Treeku dba74a6ebc Fixed calculatePvpStatus 2014-05-03 15:32:07 +01:00
Waverunner 66002081ea Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/common/BountyListItem.java
2014-04-30 15:57:30 -04:00
Waverunner 6e9be7e610 Setting bounties now accounts for all of your available funds 2014-04-30 15:54:44 -04:00
CharonInferar 4f2b50fa97 merge conflict 2014-04-30 19:58:18 +02: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 af64aae9f1 Fixed merge clashes 2014-04-29 05:33:16 +01: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 de296b4db2 More removed DeedObject stuff
Also changed attachments to use ids instead of objects.  Best to use Ids
otherwise issues such as objects not deleting successfully occur, if not
outright causing persistence errors during saving.
2014-04-29 03:48:32 +01:00
Waverunner b0e2a490f6 Changes to MissionObjective, started working on player bounties 2014-04-28 17:37:23 -04:00
Treeku 9fc30d10c4 Removed DeedObject, made buildings simpler 2014-04-28 22:07:32 +01:00
CharonInferar 76f9ff6be8 Merge remote-tracking branch 'origin/master' into PlayerCityUpdate 2014-04-26 01:30:41 +02:00
CharonInferar 0c2f4b29a0 Grant zoning added
test with 2 player chars to increase population to 2 citizens after
zoning and declare residence.
2014-04-26 01:18:18 +02:00
CharonInferar e877a44713 Jedi Loot templates inserted
Buried treasure loot realized
2014-04-25 01:49:50 +02:00
CharonInferar db8365cea3 Merge remote-tracking branch 'origin/master' into TreasureMaps 2014-04-20 17:07:58 +02:00
CharonInferar ea947869eb Added foraged items and worms
worms spawn
Enzymes and maps can be foraged
2014-04-19 23:56:15 +02:00
Treeku b4a6ac5334 Fixed a chat crash bug 2014-04-19 08:30:12 +01:00
CharonInferar f8909fbda1 Command and animation done 2014-04-19 05:08:37 +02:00
Treeku b050065649 Languages implemented, added OOB to spatialchat 2014-04-19 03:27:08 +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
Treeku f58b7b6a5b Overhauled Mounts (still buggy) 2014-04-18 19:09:45 +01:00
Waverunner 9252ebaaea Added Enter & Leave Messages for ChatRooms as well as info stats for the
room
2014-04-17 16:01:12 -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
Waverunner 2127ff1f6f Removed import in GroupChat and PlanetChat scripts 2014-04-16 17:57:15 -04:00
Waverunner ff6c2d7d4c Added GroupChat, PlanetChat, and basic chat channels 2014-04-16 16:52:11 -04:00
Seefo 77bea7604e Fixed an error in the setgodmode command 2014-04-16 13:35:00 -04:00
Treeku fcba41a40e Merge pull request #445 from Ziggeh/master
Added some setbonus scripts and other misc stuff
2014-04-16 16:41:41 +01:00
CharonInferar b36081e630 Improvements on loot system
Loot icon
Loot system messages
2014-04-16 17:18:59 +02:00
Ziggeh af2f1d6dc4 Merge remote-tracking branch 'upstream/master' 2014-04-16 16:46:46 +02:00
ZiggehandCharonInferar f12ad61a9f 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-14 19:58:43 +02:00
Treeku 9f75c370ab Merge pull request #424 from Ziggeh/master
Refactored WeaponObject
2014-04-14 16:34:55 +01:00
Ziggeh 7472def68a Items - Added Heroism items
Also added a Flamethrower to the frog since we didn't have one.
2014-04-14 00:41:41 +02:00
Seefo 90fb528d5f Fixed #423 2014-04-13 14:38:42 -04:00