Commit Graph
1114 Commits
Author SHA1 Message Date
Waverunner c85eb36eec Added Guild Permissions List, Added setting of permissions via permissions list, minor SUI Table method changes 2014-05-25 14:25:41 -04:00
Waverunner 20302dd880 Fixed mobile errors preventing startup 2014-05-24 20:31:42 -04:00
Waverunner 56edd2f582 Fix error 2014-05-24 20:15:50 -04:00
Light db302b62dc Merge branch 'master' of github.com:tacef/NGECore2 into tacef-master
Conflicts:
	scripts/mobiles/corellia/blood_stained_prowler.py
	scripts/mobiles/corellia/blood_thirsty_monarch.py
	scripts/mobiles/dathomir/bane_back_spider.py
	scripts/mobiles/endor/arachne_queen.py
	scripts/mobiles/endor/bark_mite_burrower_collector.py
	scripts/mobiles/endor/blood_stained_merek.py
	scripts/mobiles/endor/bolle_bol_colt.py
	scripts/mobiles/endor/deranged_ravisher.py
	scripts/mobiles/endor/desert_scavenger.py
	scripts/mobiles/endor/diminutive_bounding_jax.py
	scripts/mobiles/endor/gurreck_forest_stalker.py
	scripts/mobiles/endor/infuriated_roba_protector.py
	scripts/mobiles/endor/insane_mantigrue_berserker.py
	scripts/mobiles/endor/lice_ridden_remmer_queen.py
	scripts/mobiles/endor/prowling_gurreck.py
	scripts/mobiles/endor/roaming_desert_borgle.py
	scripts/mobiles/endor/sanguin_bloodseeker_hierarch.py
	scripts/mobiles/endor/venom_filled_arachne.py
	scripts/mobiles/naboo/aggrivated_kaadu_trampler.py
	scripts/mobiles/rori/adult_pygmy_torton.py
	scripts/mobiles/talus/borvos_mutant_kahmurra.py
	scripts/mobiles/talus/ferine_razorfang.py
	scripts/mobiles/talus/festering_dung_mite_queen.py
	scripts/mobiles/talus/genetically_enhanced_kahmurra.py
	scripts/mobiles/talus/giant_decay_mite_guardian.py
	scripts/mobiles/talus/hilltop_kima.py
	scripts/mobiles/talus/kahmurra_blanca.py
	scripts/mobiles/talus/male_roba.py
	scripts/mobiles/talus/minor_guf_drolg.py
	scripts/mobiles/talus/minor_sludge_panther.py
	scripts/mobiles/talus/mire_marauder.py
	scripts/mobiles/talus/oozing_dung_mite_guardian.py
	scripts/mobiles/talus/percussive_rasp.py
	scripts/mobiles/talus/ravenous_rasp.py
	scripts/mobiles/talus/sickly_decay_mite_queen.py
	scripts/mobiles/yavin4/ancient_mamien.py
	scripts/mobiles/yavin4/angler_recluse.py
	scripts/mobiles/yavin4/blood_fanged_gackle_bat.py
2014-05-24 22:48:09 +02:00
tacef 9a71de3a41 Fixed Creaturenames and Level error in NPC scripts 2014-05-24 21:51:47 +02:00
tacef 2a89876b62 Addition to last commit 2014-05-24 20:32:47 +02:00
tacef 7b63205992 Added remaining generic imperial npc scripts 2014-05-24 20:32:28 +02:00
Light2 22ebc7c922 Merge pull request #703 from tacef/master
More Work on faction NPC scripts
2014-05-24 16:08:13 +02:00
Light2 ef41029c84 Merge pull request #697 from Tipho/master
Finished Talus-Specific Mobiles (Non Factional) and Fixed Creature Names
2014-05-24 16:04:31 +02:00
tacef cd5b843612 Added more Imperial NPC scripts
Fixed typos in some scripts
2014-05-24 15:38:40 +02:00
tacef 136b9181b6 Fixed Typos within Imperial Noncom lvl 14 and 64 2014-05-24 11:17:09 +02:00
tacef 99d83b83ee Added more Imperial NPC Scripts 2014-05-24 08:01:18 +02:00
Waverunner 615602e9b3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-23 18:22:05 -04:00
Waverunner 31fb79b406 Added GuildMember class for handling member specific variables, changed sponsoring to use GuildMember 2014-05-23 18:21:50 -04:00
tacef c4fed84d15 More imperial NPC Scripts 2014-05-23 21:06:42 +02:00
tacef e6377eca7f Added more Imperial NPC Scripts 2014-05-23 19:50:33 +02:00
CharonInferar 69105e0be1 Merge pull request #702 from CharonInferar/MixedGroup
Filled dantooine with more lair groups
2014-05-23 17:36:13 +02:00
CharonInferar 7ec3c26ead Placed more Lair areas on dantooine
Replaced most dynamic mob spawn areas on dantooine with mixed spawn
areas that spawn lairs and dnamic groups.
2014-05-23 17:31:36 +02:00
tacef b8ff47bbdd Fixed Typo in Restuss Emperors Hand 2014-05-23 15:45:37 +02:00
tacef ad0203fe27 More work on Faction NPC scripts 2014-05-23 13:38:14 +02:00
Waverunner f4947d4a33 Added guild sponsorship system, added methods to send guild mails 2014-05-22 20:04:11 -04:00
CharonInferar d450228e60 Added MixedSpawnArea
To save server resources, a mixed spawn area can consist of dynamic
groups and lair  groups. Also the minimal distance from dynamic group to
nearest lair will be kept to prevent lairs and NPCs too close together a
bit more.
2014-05-23 01:44:25 +02:00
CharonInferar 7ebbca39ff Merge pull request #700 from tacef/master
Updated Rebel and imperial Recruiter Conversation
2014-05-22 19:34:21 +02:00
tacef a64119e96a Fixed Rebel recruiter Conversation 2014-05-22 19:06:01 +02:00
tacef a431ff53a1 Updated Imperial Recruiter Convo to support recent changes to the Factionservice
Updated Factionservice, you weren´t combatant when joining faction
2014-05-22 19:04:24 +02:00
CharonInferar 8185fd0188 Merge pull request #698 from CharonInferar/DathomirSpawns
Dathomir Nightsisters and Singing mountain clan added
2014-05-22 17:33:42 +02:00
CharonInferar c28fea3cf9 Dathomir Nighsisters and Singing Mountain Clan added
- Nightsister vs Singing Mountain Clan Battle
- Wild NS and SMC spawns in some areas of the planet
2014-05-22 17:24:44 +02:00
Nathan 37e3b15e64 Added Loot to Talus NPCs 2014-05-22 00:25:04 -04:00
Nathan 29343f6819 Fixed Name 2014-05-21 23:56:23 -04:00
Nathan a26b986fb0 Added Remaining Talus NPC Mobiles (Not Including Factional) 2014-05-21 23:48:00 -04:00
Light2 c455bcbb18 minor fix 2014-05-22 00:45:30 +02:00
Light2 88bb8a4ee2 fixed krayt sizes to more realistic values 2014-05-22 00:35:11 +02:00
Light2 b03b4164cd fixed mobile template name for krayt spawns 2014-05-22 00:23:17 +02:00
Light2 54b93d4b19 Changed krayt spawns to static spawns like on live 2014-05-21 20:35:23 +02:00
Nathan 81792bd135 More Creature Name Fixes 2014-05-21 13:22:00 -04:00
Light2 c7e41a83e9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/bazaar/BazaarService.java
2014-05-21 19:16:21 +02:00
Light2 4e8a9ae47c bit more work on vendors 2014-05-21 19:02:12 +02:00
CharonInferar e8f7fe50a4 Merge remote-tracking branch 'origin/master' into ForceCrystalCave 2014-05-21 18:51:58 +02:00
CharonInferar 164ed38fc4 Added imperial outpost, fixed visibility issue
- Added force crystal hunter's cave
- Added imperial outpost NPCs
- Fixed creature visibility while mounted
- Tweaked some spawn areas
- Debugged some spawn issues
2014-05-21 18:50:02 +02:00
Nathan befd2594e6 Fixed Talus Legacy Brood Arachne 2014-05-21 12:40:05 -04:00
Nathan e5d0a9fa9f Small Name Changes/Tweaks 2014-05-21 11:49:53 -04:00
Treeku 605dcebb3a Merge pull request #679 from Tipho/master
Changes to Creature Scripts
2014-05-21 15:29:31 +01:00
Nathan f165511c47 Added Remaining Talus Animals 2014-05-21 10:22:13 -04:00
Nathan 9d6e255e7e Merge branch 'master' of https://github.com/Tipho/NGECore2 2014-05-20 21:11:55 -04:00
Tipho 4f09514870 Began Work on Talus Animals 2014-05-20 20:38:00 -04:00
Waverunner 8b5e3100fb Fixed attribute error, added missing guildchat scripts from last commit 2014-05-20 19:01:50 -04:00
Waverunner c9b2d1c2a2 Added guild chat, guild information window added, added variables in future for sponsor system 2014-05-20 18:34:53 -04:00
Tipho 4a923aa2da Small Fix 2014-05-20 15:47:43 -04:00
Treeku 6c20fc545c Merge pull request #687 from tacef/master
More work on Factional NPC scripts
2014-05-20 20:29:16 +01:00
tacef b982d78860 More work on Factional NPC scripts 2014-05-20 21:21:51 +02:00