Commit Graph
858 Commits
Author SHA1 Message Date
Levarrishawk 3f2a525636 Reorganized Static scripts
Static Spawn scripts now branched out in their planet's subfolder.
2014-05-03 19:36:48 -04:00
Waverunner 44678d8c18 Merge 2014-05-03 18:10:55 -04:00
Waverunner 7860a8b668 Added Tracking Droids, refined Bounty Missions
A few things need to be done like the stacks for the droids. Right now
they won't be destroyed from inventory until this is implemented.
2014-05-03 18:03:00 -04:00
Treeku 464c10ddd7 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-03 17:37:43 +01:00
Treeku 0c7b11068a Fixed some vehicles issues 2014-05-03 17:12:24 +01:00
CharonInferar e73ecac963 Merge remote-tracking branch 'origin/master' into DynamicWorldSpawnUpdate 2014-05-03 16:34:14 +02:00
Treeku dba74a6ebc Fixed calculatePvpStatus 2014-05-03 15:32:07 +01:00
CharonInferar 05034b4d83 group spawn distances added
Force sensitive groups now spawn at a distance to each other in random
group member numbers.
Loot added to FSs
2014-05-03 16:31:04 +02:00
CharonInferar 488e669290 More work on parameters of group members 2014-05-03 04:52:52 +02:00
Treeku 807fd829c0 Merge pull request #578 from Mesagoppinmypants/patch-46
Bad Odds Abilities Now Grant at Correct Levels
2014-05-03 03:08:13 +01:00
Treeku 5156951755 Merge pull request #579 from Mesagoppinmypants/patch-47
Shoot First Abilities Now Grant at Correct Levels
2014-05-03 03:07:48 +01:00
Mesagoppinmypants 5a012f28b7 Supply Drop Abilities Now Grant at Correct Levels 2014-05-02 22:05:38 -04:00
Mesagoppinmypants 818bce44fc Shoot First Abilities Now Grants at Correct Levels
These are now the correct levels. (checked from game client)
2014-05-02 21:56:45 -04:00
Mesagoppinmypants e7084fcd0f Bad Odds Ability Now Grants at Correct Levels
These are now the correct levels. (checked from game client)
2014-05-02 21:50:56 -04:00
CharonInferar 4752de7e74 fix 2014-05-03 00:58:56 +02:00
CharonInferar 1833f821fa Taking into account fixed member groups 2014-05-03 00:42:25 +02:00
Treeku 9cb7b38aac Fixed strength_modified.py 2014-05-02 22:52:19 +01:00
Treeku 0a4001d504 Merge pull request #571 from tacef/master
Added NPC scripts( No conversations yet)
2014-05-02 22:01:08 +01:00
tacef 47da295c00 Altered recruiters to fit faction changes 2014-05-02 22:27:40 +02:00
CharonInferar 081a30b7da dynamic spawn scripts added
Commit frequency caused by ongoing odb refactoring
2014-05-02 22:19:30 +02:00
TreekuandCharonInferar 8abc9879f5 Vehicles now have ranged gb buffs 2014-05-02 20:32:58 +02:00
Treeku 48ec7c46ed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-02 16:30:46 +01:00
Light2 6cd794a6c3 minor fix 2014-05-01 21:25:35 +02:00
Light2 536b51d953 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	.gitignore
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/mission/MissionObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/chat/Mail.java
	src/services/mission/MissionObjective.java
	src/services/object/ObjectService.java
	src/services/playercities/PlayerCity.java
2014-05-01 21:08:20 +02:00
tacef 45dd5bc9e5 Fixed little error in Rebel Recruiter conversation 2014-05-01 20:54:53 +02:00
Light2 7d457101f3 Refactored odb system (read extended), added implementation of Dynamic World Spawns
ODB no longer uses DPL layer of Berkeley DB, persistent classes have to
implement the Serializable interface, annotations are no longer used,
use transient modifier for variables that should not be persistent.
Entity reference errors will no longer occur, however it is better to
use ids if the entity that is being referenced is stored in the db too!
(or you will have two different objects). DB is cached for 5 minutes
then it will write its log/cache to disk, transactions are no longer
used.
2014-05-01 20:33:38 +02:00
tacef 3b3c9bd6ef Fixed Typo in Reimos conversation script 2014-05-01 19:50:03 +02:00
tacef 7043f6a159 Updated NPC Scripts with conversations 2014-05-01 19:38:12 +02:00
tacef e111724115 Added NPC scripts( No conversations yet) 2014-05-01 18:25:39 +02:00
Levarrishawk 12ca3ae661 Added Subfolders for Planetary Statics
Pending move of all static spawn scripts to these subfolders.
2014-05-01 07:42:55 -04:00
Levarrishawk f32074094e Modified Kaas Script
Commented out all POB structures pending a possible relocation to
snapshot.
2014-05-01 07:38:35 -04:00
Freddiec 36a947b369 Update landspeeder_tantive4_deed.py 2014-04-30 22:20:34 -05:00
Waverunner fe2c9a83a5 Merge pull request #567 from tacef/master
Updated Terminal scripts to use STF Strings
2014-04-30 23:09:16 -04:00
tacef 29a88981e0 Updated Terminal scripts to use STF Strings 2014-05-01 04:27:25 +02:00
Treeku 5b5ebaf11c Vehicles now have ranged gb buffs 2014-04-30 23:49:55 +01:00
CharonInferar 81aa0bb850 Merge pull request #565 from tacef/master
Added Scripts for imperial and Rebel recruiter NPC's
2014-04-30 22:09:07 +02:00
tacef 091d540ae8 Added Rebel Recruiter script
Added Rebelrecruiter to mos eisley cantina for testing reasons
2014-04-30 22:05:59 +02: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 717f1951f0 Reconstruction of classes 2014-04-30 21:48:07 +02:00
tacef 8818a821d6 Added Imperial Recruiter scripts
Also added 1 recruiter to mos eisley for testing purpose
2014-04-30 21:46:25 +02:00
CharonInferar 4f2b50fa97 merge conflict 2014-04-30 19:58:18 +02:00
CharonInferar 2a23dd8076 merge conflict resolve 2014-04-30 19:45:12 +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 2de5cbe362 Static object and doid fixes 2014-04-29 19:41:05 +01:00
Treeku 8fa9be6030 Revert "Temp Fix to Static Spawns"
This reverts commit bfa32b533f.
2014-04-29 18:33:00 +01:00
Levarrishawk bfa32b533f Temp Fix to Static Spawns
Temporary fix for the handling of static spawned objects.
2014-04-29 09:27:57 -04:00
Levarrishawk 3933fe8a65 Misc Changes to Kaas
Nothing to see here, move along.
2014-04-29 04:19:35 -04:00
Treeku 3368682443 Static objects now use doids 2014-04-29 08:36:44 +01:00
Treeku af64aae9f1 Fixed merge clashes 2014-04-29 05:33:16 +01:00