Commit Graph
1850 Commits
Author SHA1 Message Date
Treeku a5ee3ff2b4 StaticService can now use mobileTemplates
Just put a mobileTemplate in place of the objectTemplate.
2014-05-04 23:22:15 +01:00
Treeku 966f207d10 Temp changes until tested more 2014-05-04 20:31:02 +01:00
Treeku 792257e70f Recommitted changes 2014-05-04 20:10:33 +01:00
Treeku 41498ca611 Reverted .project commit 2014-05-04 20:04:41 +01:00
Light2 a4216f76b5 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-04 20:54:54 +02:00
Light2 db4a47b35a Equipment list now uses ids instead of the referencing the object to avoid storing duplicate objects in the db 2014-05-04 20:54:41 +02:00
Treeku 541bffa942 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-04 18:56:34 +01:00
Treeku 44d45c236a Merge pull request #595 from tacef/master
Updated Krayt Spawns to be more accurate to live
2014-05-04 18:47:46 +01:00
tacef 1ecdb6ac14 Updated Krayt Spawns to be more accurate to live 2014-05-04 19:45:33 +02:00
Treeku 6b50c6082b Fixed some recruiter stuff 2014-05-04 18:42:15 +01:00
Treeku 94c2f19ed4 Removed reuse_item condition from timer items 2014-05-04 18:41:14 +01:00
Light2 3c3155b8b2 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-04 19:34:28 +02:00
Light2 a5411ab44b fixed another null pointer 2014-05-04 19:34:16 +02: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
Light2 ba02d56ef8 fixed null pointer 2014-05-04 18:22:27 +02:00
Light2 8e9f8fa341 fixed generating vehicles 2014-05-04 18:19:50 +02:00
Light2 8f660e92ba Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-04 17:38:22 +02:00
Light2 e78f1ec8fa Added harvesting and milking of creatures, fixed odb save bug 2014-05-04 17:37:58 +02:00
Levarrishawk 327f0b55fd Corrected exception in script. 2014-05-04 05:41:16 -04:00
Levarrishawk e8a3da16f7 Additional Tatooine Statics
It is recommended that more NPCs not be added beyond this for now.
Several of the NPCs added to date will need adjustments made.
2014-05-04 05:32:27 -04:00
Levarrishawk 10022b99b8 Added Spawns for Mos Espa / Entha 2014-05-04 05:24:55 -04:00
Levarrishawk 56c3ddac69 Added Spawns in Anchorhead / Bestine 2014-05-04 05:17:06 -04:00
Levarrishawk a37551678e Moved Recruiter to Anchorhead
There was no Rebel Recruiter in Eisley, relocated to Anchorhead Cantina.
2014-05-04 04:42:30 -04:00
Levarrishawk 8d8c7938c5 Migrated statics, added junk dealers.
Mos Eisley now has the proper number of Junk Dealer NPCs throughout the
city.
2014-05-04 04:07:59 -04:00
Levarrishawk 778a7ba56e Merge pull request #593 from tacef/master
Populated Krayt Graveyard
2014-05-04 03:37:40 -04:00
tacef 11407142c5 Updated Mobiles to use new Spawnsystem
Needs testing
2014-05-04 09:33:37 +02:00
Levarrishawk 0123d8bebc Added Comments to Tatooine Scripts
added TODO annotations for once certain buildout structures spawn as
intended again.
2014-05-04 03:19:51 -04:00
tacef e3dc65a791 Populated Areas around Mos Eisley
Altered Static Spawns in Mos Eisley to use their personalizes scripts
Moved Imp and Reb recruiter from tatooine.py to mos_eisley.py
2014-05-04 09:15:55 +02:00
tacef d16eef9e44 Populated Krayt Graveyard
Altered mobile Templates to work with the new Dynamicspawn system(needs
testing)
2014-05-04 08:30:49 +02:00
Treeku 22f79113a1 Merge pull request #592 from Mesagoppinmypants/patch-54
Added Buff to Breath of Heaven
2014-05-04 04:10:31 +01:00
Treeku 5952b2f53a Merge pull request #591 from Mesagoppinmypants/patch-53
Set Breath of Heaven as Consumable
2014-05-04 04:09:22 +01:00
Treeku f2514a0175 Merge pull request #590 from Mesagoppinmypants/patch-52
Added Radial to Breath of Heaven
2014-05-04 04:08:57 +01:00
Treeku 7412ba55b5 Merge pull request #589 from Mesagoppinmypants/patch-51
Added Breath of Heaven to Frog
2014-05-04 04:08:19 +01:00
Mesagoppinmypants 12e050215e Added Buff to Breath of Heaven 2014-05-03 22:46:30 -04:00
Mesagoppinmypants 5e25d441b9 Set Breath of Heaven as Consumable
Tested and Worked.
2014-05-03 22:45:34 -04:00
Mesagoppinmypants bd9f380835 Added Radial to Breath of Heaven
Tested and worked.
2014-05-03 22:43:45 -04:00
Mesagoppinmypants d7fb0aba06 Added Breath of Heaven to Frog
(actual buff with be in another commit)
Tested and Worked.
This'll be used for testing item buffs.
2014-05-03 22:42:47 -04:00
CharonInferar 40ff4fe47d Merge pull request #588 from CharonInferar/ScriptUpdates
Social groups and assist ranges added to FS
2014-05-04 04:16:28 +02:00
CharonInferar 22d0699db9 Social groups and assist ranges added to FS
Social groups added
FS NPCs' Weapons changed to how they were on live
2014-05-04 04:14:31 +02:00
CharonInferar db66764232 Merge pull request #585 from CharonInferar/ScriptUpdates
Devservice error fix
2014-05-04 02:22:28 +02:00
CharonInferar ffe4dd4aaf Fix of Devservice error insertion 2014-05-04 02:20:38 +02:00
Waverunner 6a3dd3790b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2.git 2014-05-03 20:09:16 -04:00
Waverunner 4831f6d8ca Added handling of deathblow for bounties 2014-05-03 20:04:27 -04:00
CharonInferar 8173272296 upstream merge 2014-05-04 01:46:37 +02:00
CharonInferar d4ae4a4fbb ngepublic difference 2014-05-04 01:37:16 +02:00
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 e161871ee4 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-03 20:21:02 +01:00
Treeku 7e1e0bb4ec Corrected y to z, altered how chars disappear 2014-05-03 20:19:57 +01:00