projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-03 04:16:19 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Treeku
2014-05-17 22:15:55 +01:00
parent 28ccc21d10 499e4aa877
commit 8bca0d625d
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/mobiles/dantooine/dark_jedi_master.py
+26
View File
@@ -41,6 +41,32 @@ def addTemplate(core):
attacks = Vector()
mobileTemplate.setDefaultAttack('saberHit')
mobileTemplate.setAttacks(attacks)
lootPoolNames_1 = ['Junk']
lootPoolChances_1 = [100]
lootGroupChance_1 = 65
mobileTemplate.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1)
lootPoolNames_2 = ['jedi_relic_1']
lootPoolChances_2 = [100]
lootGroupChance_2 = 85
mobileTemplate.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2)
lootPoolNames_3 = ['powercrystals_hiq']
lootPoolChances_3 = [100]
lootGroupChance_3 = 12
mobileTemplate.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3)
lootPoolNames_4 = ['random_stat_jewelry']
lootPoolChances_4 = [100]
lootGroupChance_4 = 8
mobileTemplate.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4)
lootPoolNames_5 = ['sithholocrons']
lootPoolChances_5 = [100]
lootGroupChance_5 = 3
mobileTemplate.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5)
core.spawnService.addMobileTemplate('dark_jedi_master', mobileTemplate)
src/services/spawn/MobileTemplate.java
+2 -1
View File
@@ -21,6 +21,7 @@
******************************************************************************/
package services.spawn;
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
@@ -59,7 +60,7 @@ public class MobileTemplate implements Cloneable {
private String meatType, milkType, boneType, hideType;
private int meatAmount, milkAmount, boneAmount, hideAmount;
private int respawnTime = 0;
private List<LootGroup> lootGroups;
private List<LootGroup> lootGroups = new ArrayList<LootGroup>();
public Vector<String> getTemplates() {
src/services/spawn/SpawnService.java
+2 -2
View File
@@ -100,7 +100,7 @@ public class SpawnService {
creature.setWeaponId(mobileTemplate.getCustomWeapon().getObjectID());
}*/
if(mobileTemplate.getLootGroups() != null)
if(mobileTemplate.getLootGroups() != null && !mobileTemplate.getLootGroups().isEmpty())
creature.setLootGroups(mobileTemplate.getLootGroups());
creature.setOptionsBitmask(mobileTemplate.getOptionsBitmask());
@@ -118,7 +118,7 @@ public class SpawnService {
level = mobileTemplate.getLevel();
}
if (mobileTemplate.getMinLevel()!=0 && mobileTemplate.getMaxLevel()!=0){
if (mobileTemplate.getMinLevel()!=0 && mobileTemplate.getMaxLevel()!=0 && level == -1){
level = (short) (mobileTemplate.getMinLevel() + (new Random().nextInt(mobileTemplate.getMaxLevel()-mobileTemplate.getMinLevel())));
creature.setLevel(level);
}