arg/scriptcraft
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use DyeColor.values() to get better array of colors for fireworks.

Browse source
This commit is contained in:
walterhiggins 2015-05-31 20:04:05 +01:00
parent 0148a62447
commit ff4ca68366
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/js/modules/canary/fireworks.js
View file

@ -5,10 +5,13 @@ var Canary = Packages.net.canarymod.Canary;
var cmFireworkHelper = Packages.net.canarymod.api.inventory.helper.FireworkHelper; var cmFireworkHelper = Packages.net.canarymod.api.inventory.helper.FireworkHelper;
var cmExplosionType = Packages.net.canarymod.api.inventory.helper.FireworkHelper.ExplosionType; var cmExplosionType = Packages.net.canarymod.api.inventory.helper.FireworkHelper.ExplosionType;
var explosionTypes = ['STAR','BURST','CREEPER','LARGE','SMALL']; var explosionTypes = ['STAR','BURST','CREEPER','LARGE','SMALL'];
var cmDyeColor = Packages.net.canarymod.api.DyeColor;
var entityFactory = Canary.factory().entityFactory; var entityFactory = Canary.factory().entityFactory;
var cmEntityType = Packages.net.canarymod.api.entity.EntityType; var cmEntityType = Packages.net.canarymod.api.entity.EntityType;
var colors = [0xff0000, 0xffff00, 0x00ff00, 0x0000ff]; var colors = [].concat(cmDyeColor.values());
function canaryFirework( location ) { function canaryFirework( location ) {
var firework = items.fireworkStar(1); var firework = items.fireworkStar(1);
var i1 = Math.floor(Math.random()* colors.length); var i1 = Math.floor(Math.random()* colors.length);
var i2 = Math.floor(Math.random()* colors.length); var i2 = Math.floor(Math.random()* colors.length);
@ -16,9 +19,10 @@ function canaryFirework( location ) {
if (colorsToUse.length == 0){ if (colorsToUse.length == 0){
colorsToUse = colors; colorsToUse = colors;
} }
cmFireworkHelper.addStarColorsRaw(firework, colorsToUse); cmFireworkHelper.addStarColors( firework, colorsToUse );
cmFireworkHelper.setDoesFlicker( firework, true); cmFireworkHelper.setDoesFlicker( firework, true );
cmFireworkHelper.setDoesTrail( firework, true ); cmFireworkHelper.setDoesTrail( firework, true );
// use a random explosion type // use a random explosion type
var rnd = Math.floor(Math.random() * explosionTypes.length); var rnd = Math.floor(Math.random() * explosionTypes.length);
var type = explosionTypes[rnd]; var type = explosionTypes[rnd];
@ -29,6 +33,7 @@ function canaryFirework( location ) {
var rocketEntity = entityFactory.newEntity(cmEntityType.FIREWORKROCKET, location); var rocketEntity = entityFactory.newEntity(cmEntityType.FIREWORKROCKET, location);
rocketEntity.item = rocket; rocketEntity.item = rocket;
rocketEntity.spawn(); rocketEntity.spawn();
} }
module.exports = canaryFirework; module.exports = canaryFirework;