diff --git a/toontown/ai/QuestManagerAI.py b/toontown/ai/QuestManagerAI.py index 71125c5f..0b19cf87 100644 --- a/toontown/ai/QuestManagerAI.py +++ b/toontown/ai/QuestManagerAI.py @@ -418,7 +418,7 @@ class QuestManagerAI: return (recoveredItems, unrecoveredItems) - def toonKilledBuilding(self, av, type, difficulty, floors, zoneId, activeToons): + def toonKilledBuilding(self, av, type, difficulty, floors, zoneId, activeToons, cogdo): # Get the avatars current quests. avQuests = av.getQuests() questList = [] @@ -432,9 +432,10 @@ class QuestManagerAI: if isinstance(questClass, Quests.BuildingQuest): if questClass.isLocationMatch(zoneId): if questClass.doesBuildingTypeCount(type): - if questClass.doesBuildingCount(av, activeToons): - if floors >= questClass.getNumFloors(): - questDesc[QuestProgressIndex] += 1 + if questClass.isCogdo() == cogdo: + if questClass.doesBuildingCount(av, activeToons): + if floors >= questClass.getNumFloors(): + questDesc[QuestProgressIndex] += 1 questList.append(questDesc) av.b_setQuests(questList) diff --git a/toontown/battle/ParticleDefs.py b/toontown/battle/ParticleDefs.py index 7e24ec2f..07da384b 100644 --- a/toontown/battle/ParticleDefs.py +++ b/toontown/battle/ParticleDefs.py @@ -13,7 +13,7 @@ def gearExplosion(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -24,18 +24,17 @@ def gearExplosion(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(4.2000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/gear") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -49,18 +48,18 @@ def gearExplosion(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(9.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 9.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -2.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(3.2282) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -79.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0100, 1) force0.setActive(1) f0.addForce(force0) @@ -74,7 +73,7 @@ def smokeTest4(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("DiscEmitter") @@ -85,18 +84,17 @@ def smokeTest4(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(2.0000) p0.factory.setLifespanSpread(0.5000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAINOUT) p0.renderer.setUserAlpha(0.57) - # Sprite parameters + p0.renderer.addTextureFromFile('../../ttmodels/src/maps/tt_t_efx_ext_smoke.tif') p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setXScaleFlag(1) @@ -110,14 +108,14 @@ def smokeTest4(self): p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) p0.renderer.getColorInterpolationManager().addLinear(0.0,1.0,Vec4(0.28235295414924622,0.28235295414924622,0.28235295414924622,1.0),Vec4(0.28235295414924622,0.28235295414924622,0.28235295414924622,1.0),1) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(0.4000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 6.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Disc parameters + p0.emitter.setRadius(1.0000) self.addParticles(p0) @@ -129,7 +127,7 @@ def gearExplosionSmall(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -140,18 +138,17 @@ def gearExplosionSmall(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.5000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/gear") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -165,18 +162,18 @@ def gearExplosionSmall(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(9.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 9.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -2.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(3.2282) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -79.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0100, 1) force0.setActive(1) f0.addForce(force0) @@ -190,7 +187,7 @@ def gearExplosionBig(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -201,18 +198,17 @@ def gearExplosionBig(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(4.2000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/gear") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -226,18 +222,18 @@ def gearExplosionBig(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(15.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 18.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -2.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(1.6282) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -79.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0100, 1) force0.setActive(1) f0.addForce(force0) @@ -251,7 +247,7 @@ def poundkey(self): self.setHpr(-180.000, -0.000, 180.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -262,18 +258,17 @@ def poundkey(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.5000) p0.factory.setLifespanSpread(0.2000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(20.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/poundsign") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -287,18 +282,18 @@ def poundkey(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(10.0000) p0.emitter.setAmplitudeSpread(3.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 4.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.200) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearVectorForce(Vec3(0.0000, 0.0000, 0.0000), 100.0000, 0) force0.setActive(1) f0.addForce(force0) @@ -316,7 +311,7 @@ def shred(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -327,18 +322,17 @@ def shred(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.9000) p0.factory.setLifespanSpread(0.4000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.2000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/roll-o-dex") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -352,18 +346,18 @@ def shred(self): p0.renderer.setNonanimatedTheta(5.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(5.0000) p0.emitter.setAmplitudeSpread(1.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 3.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -7.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.6000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearVectorForce(Vec3(0.0000, 0.0000, 5.0000), 1.0000, 0) force0.setActive(1) f0.addForce(force0) @@ -386,10 +380,9 @@ def withdrawal(self): self.setHpr(-180.000, 0.000, 0.000) self.setScale(4.000, 4.000, 4.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") - #p0.setRenderer("PointParticleRenderer") p0.setEmitter("DiscEmitter") p0.setPoolSize(150) p0.setBirthRate(0.0200) @@ -398,18 +391,17 @@ def withdrawal(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.4000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAIN) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/snow-particle") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -423,21 +415,18 @@ def withdrawal(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Line parameters - #p0.renderer.setHeadColor(Vec4(1.00, 0.00, 0.00, 1.00)) - #p0.renderer.setTailColor(Vec4(1.00, 0.00, 0.00, 1.00)) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(-0.4000) p0.emitter.setAmplitudeSpread(0.1000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 1.5000, 0.0000)) - # Disc parameters + p0.emitter.setRadius(1.7000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearVectorForce(Vec3(0.0000, 1.0000, 0.0000), 1.0000, 0) force0.setActive(1) f0.addForce(force0) @@ -451,7 +440,7 @@ def mumboJumboSmother(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereSurfaceEmitter") @@ -462,18 +451,17 @@ def mumboJumboSmother(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.5000) p0.factory.setLifespanSpread(0.0300) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/mumbojumbo-iron") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -487,18 +475,18 @@ def mumboJumboSmother(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(-5.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Surface parameters + p0.emitter.setRadius(1.5000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(37.2697, 0) force0.setActive(1) f0.addForce(force0) @@ -512,7 +500,7 @@ def buzzWord(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -523,18 +511,17 @@ def buzzWord(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.0000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/buzzwords-crash") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -548,18 +535,18 @@ def buzzWord(self): p0.renderer.setNonanimatedTheta(20.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(8.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 7.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -3.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.0010) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(64.5449, 0) force0.setActive(1) f0.addForce(force0) @@ -573,7 +560,7 @@ def penSpill(self): self.setHpr(0.000, 0.000, -90.000) self.setScale(1.100, 1.100, 1.100) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -584,18 +571,17 @@ def penSpill(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.5000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/raindrop") p0.renderer.setColor(Vec4(0, 0, 0, 1.00)) @@ -609,18 +595,18 @@ def penSpill(self): p0.renderer.setNonanimatedTheta(90.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(3.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -2.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.2282) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -99.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0100, 1) force0.setActive(1) f0.addForce(force0) @@ -634,7 +620,7 @@ def fingerwag(self): self.setHpr(90.000, -36.310, -0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("PointEmitter") @@ -645,18 +631,17 @@ def fingerwag(self): p0.setSystemLifespan(2.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.6000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(410.7267) p0.factory.setTerminalVelocitySpread(2.3816) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(0.86) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/blah") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -670,18 +655,18 @@ def fingerwag(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPNOBLEND) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETEXPLICIT) p0.emitter.setAmplitude(3.0000) p0.emitter.setAmplitudeSpread(2.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Point parameters + p0.emitter.setLocation(Point3(0.0000, 0.0000, 0.0000)) self.addParticles(p0) f0 = ForceGroup.ForceGroup('jfo') - # Force parameters + force0 = LinearJitterForce(4.0000, 0) force0.setActive(1) f0.addForce(force0) @@ -701,7 +686,7 @@ def doubleTalkRight(self): self.setHpr(-55.000, 0.000, 0.000) self.setScale(3.000, 3.000, 3.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -712,18 +697,17 @@ def doubleTalkRight(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.7000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/doubletalk-good") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -737,18 +721,18 @@ def doubleTalkRight(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(12.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.6000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -8.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.0500) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(-6.000, -3.0000, 0.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 1.5000, 1) force0.setActive(1) f0.addForce(force0) @@ -762,7 +746,7 @@ def filibusterSpray(self): self.setHpr(0.000, 55.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -773,18 +757,17 @@ def filibusterSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.2700) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/filibuster-cut") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -798,18 +781,18 @@ def filibusterSpray(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(5.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 8.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -1.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.1000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, -9.0000, -11.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 1.3661, 1) force0.setActive(1) f0.addForce(force0) @@ -823,7 +806,7 @@ def fingerwag2(self): self.setHpr(-2.862, -36.310, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("RingEmitter") @@ -834,18 +817,17 @@ def fingerwag2(self): p0.setSystemLifespan(2.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.6000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(410.7267) p0.factory.setTerminalVelocitySpread(2.3816) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(0.86) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/blah") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -859,18 +841,18 @@ def fingerwag2(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPNOBLEND) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Ring parameters + p0.emitter.setRadius(1.0000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('jfo') - # Force parameters + self.addForceGroup(f0) @@ -881,7 +863,7 @@ def schmoozeLowerSpray(self): self.setHpr(0.000, -55.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -892,18 +874,17 @@ def schmoozeLowerSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.900) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/schmooze-master") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -917,18 +898,18 @@ def schmoozeLowerSpray(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(5.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 11.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -1.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.1000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, -23.0000, 9.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 1.3661, 1) force0.setActive(1) f0.addForce(force0) @@ -942,7 +923,7 @@ def brainStorm(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("DiscEmitter") @@ -953,18 +934,17 @@ def brainStorm(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/brainstorm-box") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -978,18 +958,18 @@ def brainStorm(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(5.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 5.0000)) - # Disc parameters + p0.emitter.setRadius(0.5000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(15.0000, 0) force0.setActive(1) f0.addForce(force0) @@ -1003,7 +983,7 @@ def numberSpray(self): self.setHpr(-180.000, 80.000, -180.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -1014,18 +994,17 @@ def numberSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(2.1000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/fire") p0.renderer.setColor(Vec4(0.00, 0.00, 0.00, 1.00)) @@ -1039,18 +1018,18 @@ def numberSpray(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(5.1000) p0.emitter.setAmplitudeSpread(2.5000) p0.emitter.setOffsetForce(Vec3(0.0000, 9.1000, -4.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -4.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.500) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -3.5000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 2.5308, 1) force0.setActive(1) f0.addForce(force0) @@ -1067,12 +1046,10 @@ def demotionUnFreeze(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(2.000, 2.000, 2.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") - #p0.setRenderer("PointParticleRenderer") p0.setEmitter("SphereVolumeEmitter") - #p0.setEmitter("SphereSurfaceEmitter") p0.setPoolSize(70) p0.setBirthRate(0.0200) p0.setLitterSize(10) @@ -1080,18 +1057,17 @@ def demotionUnFreeze(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.5000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/roll-o-dex") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -1105,14 +1081,14 @@ def demotionUnFreeze(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(4.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Surface parameters + p0.emitter.setRadius(0.6000) self.addParticles(p0) @@ -1124,7 +1100,7 @@ def fillWithLeadSmother(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereSurfaceEmitter") @@ -1135,18 +1111,17 @@ def fillWithLeadSmother(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.5000) p0.factory.setLifespanSpread(0.0300) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/mumbojumbo-iron") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -1160,18 +1135,18 @@ def fillWithLeadSmother(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(-5.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Surface parameters + p0.emitter.setRadius(1.1000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(37.2697, 0) force0.setActive(1) f0.addForce(force0) @@ -1185,7 +1160,7 @@ def downsizeSpray(self): self.setHpr(0.000, 60.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -1196,18 +1171,17 @@ def downsizeSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.3000) p0.factory.setLifespanSpread(0.2000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/snow-particle") p0.renderer.setColor(Vec4(1.00, 1.00, 0.00, 0.80)) @@ -1221,18 +1195,18 @@ def downsizeSpray(self): p0.renderer.setNonanimatedTheta(20.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(4.9000) p0.emitter.setAmplitudeSpread(0.3000) p0.emitter.setOffsetForce(Vec3(0.0000, 7.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -3.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.0010) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -5.3000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 2.5308, 1) force0.setActive(1) f0.addForce(force0) @@ -1252,7 +1226,7 @@ def fillWithLeadSpray(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -1263,18 +1237,17 @@ def fillWithLeadSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(2.9000) p0.factory.setLifespanSpread(0.4000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.2000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/roll-o-dex") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -1288,18 +1261,18 @@ def fillWithLeadSpray(self): p0.renderer.setNonanimatedTheta(5.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(5.0000) p0.emitter.setAmplitudeSpread(1.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 5.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -7.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.01000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearVectorForce(Vec3(0.0000, 0.0000, 5.0000), 1.0000, 0) force0.setActive(1) f0.addForce(force0) @@ -1322,10 +1295,9 @@ def reorgCloud(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(2.000, 2.000, 2.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") - #p0.setRenderer("PointParticleRenderer") p0.setEmitter("SphereSurfaceEmitter") p0.setPoolSize(70) p0.setBirthRate(0.0200) @@ -1334,18 +1306,17 @@ def reorgCloud(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.5000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/snow-particle") p0.renderer.setColor(Vec4(1.00, 0.00, 0.00, 1.00)) @@ -1359,14 +1330,14 @@ def reorgCloud(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(-1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Surface parameters + p0.emitter.setRadius(1.0000) self.addParticles(p0) @@ -1378,10 +1349,9 @@ def demotionFreeze(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(2.000, 2.000, 2.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") - #p0.setRenderer("PointParticleRenderer") p0.setEmitter("SphereSurfaceEmitter") p0.setPoolSize(70) p0.setBirthRate(0.0200) @@ -1390,18 +1360,17 @@ def demotionFreeze(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.5000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/roll-o-dex") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -1415,14 +1384,14 @@ def demotionFreeze(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(-1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Surface parameters + p0.emitter.setRadius(1.0000) self.addParticles(p0) @@ -1434,10 +1403,9 @@ def demotionSpray(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") - #p0.setRenderer("PointParticleRenderer") p0.setEmitter("SphereVolumeEmitter") p0.setPoolSize(150) p0.setBirthRate(0.0500) @@ -1446,18 +1414,17 @@ def demotionSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.8000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/roll-o-dex") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -1471,14 +1438,14 @@ def demotionSpray(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(3.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 6.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -4.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.8900) self.addParticles(p0) @@ -1490,7 +1457,7 @@ def powertrip2(self): self.setHpr(-90.000, 0.000, 0.000) self.setScale(4.800, 4.800, 4.800) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -1501,36 +1468,34 @@ def powertrip2(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.2500) p0.factory.setLifespanSpread(0.050) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters p0.renderer.setCenterColor(Vec4(0.1, 0.95, 0.2, 1.00)) p0.renderer.setEdgeColor(Vec4(0, 0, 0, 1.00)) p0.renderer.setBirthRadius(0.1000) p0.renderer.setDeathRadius(15.0000) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(2.4000) p0.emitter.setAmplitudeSpread(1.1000) p0.emitter.setOffsetForce(Vec3(0.0000, 1.1000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -4.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.120) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(-10.0000, 0.0000, 0.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 2.5308, 1) force0.setActive(1) f0.addForce(force0) @@ -1547,10 +1512,10 @@ def powertrip2(self): def rollodexVortex(self): self.reset() self.setPos(-0.003, 2.465, 3.714) - self.setHpr(84.924, 13.378, 56.334) #(70.004, -75.422, 35.756) + self.setHpr(84.924, 13.378, 56.334) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("TangentRingEmitter") @@ -1561,18 +1526,17 @@ def rollodexVortex(self): p0.setSystemLifespan(5.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.5000) p0.factory.setLifespanSpread(0.2500) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(40.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/rollodex-card") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -1586,18 +1550,18 @@ def rollodexVortex(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(3.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Tangent Ring parameters + p0.emitter.setRadius(0.7500) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forward') - # Force parameters + force0 = LinearSourceForce(Point3(0.0000, 0.0000, 0.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 1.0000, 1) force0.setActive(1) f0.addForce(force0) @@ -1620,7 +1584,7 @@ def pixieExplode(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(3.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -1631,35 +1595,34 @@ def pixieExplode(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.5000) p0.factory.setLifespanSpread(0.2000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setEdgeColor(Vec4(0.00, 0.00, 1.00, 1.00)) p0.renderer.setBirthRadius(0.0400) p0.renderer.setDeathRadius(0.0000) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETEXPLICIT) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0100) p0.emitter.setOffsetForce(Vec3(-0.1000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.5000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -4.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.1000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(2.0000, 0) force0.setActive(1) f0.addForce(force0) @@ -1673,7 +1636,7 @@ def guiltTrip(self): self.setHpr(-90.000, 0.000, 0.000) self.setScale(4.800, 4.800, 4.800) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -1684,36 +1647,34 @@ def guiltTrip(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.4000) p0.factory.setLifespanSpread(0.000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters p0.renderer.setCenterColor(Vec4(1.0, 0, 0, 0.9)) p0.renderer.setEdgeColor(Vec4(0.8, 0.8, 0.8, 0.4)) p0.renderer.setBirthRadius(0.1000) p0.renderer.setDeathRadius(15.0000) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(2.4000) p0.emitter.setAmplitudeSpread(1.1000) p0.emitter.setOffsetForce(Vec3(0.0000, 1.1000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -4.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.120) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(14.5449, 0) force0.setActive(1) f0.addForce(force0) @@ -1726,7 +1687,7 @@ def soundBreak(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("ZSpinParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("PointEmitter") @@ -1737,25 +1698,23 @@ def soundBreak(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.5000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Z Spin factory parameters + p0.factory.setInitialAngle(0.0000) p0.factory.setInitialAngleSpread(180.0000) p0.factory.enableAngularVelocity(1) p0.factory.setAngularVelocity(0.0000) p0.factory.setAngularVelocitySpread(0.0000) - # Renderer parameters p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAINOUT) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setTextureFromNode("phase_5/models/props/uberSoundEffects", "**/break") - #p0.renderer.addTextureFromFile('maps/break.tif') p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setXScaleFlag(1) p0.renderer.setYScaleFlag(1) @@ -1767,14 +1726,14 @@ def soundBreak(self): p0.renderer.setNonanimatedTheta(319.3987) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Point parameters + p0.emitter.setLocation(Point3(0.0000, 0.0000, 0.0000)) self.addParticles(p0) @@ -1786,7 +1745,7 @@ def pixiePoof(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -1797,31 +1756,30 @@ def pixiePoof(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.0000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setEdgeColor(Vec4(0.04, 0.04, 1.00, 1.00)) p0.renderer.setBirthRadius(0.0272) p0.renderer.setDeathRadius(0.1872) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.200) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') @@ -1834,7 +1792,7 @@ def waterfall(self): self.setHpr(0.000, -45.000, 0.000) self.setScale(4.000, 4.000, 4.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("DiscEmitter") @@ -1845,35 +1803,34 @@ def waterfall(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.1000) p0.factory.setLifespanSpread(0.1000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(0.1, 0.95, 0.2, 1.00)) p0.renderer.setEdgeColor(Vec4(0.00, 0.00, 0.00, 1.00)) p0.renderer.setBirthRadius(0.0200) p0.renderer.setDeathRadius(0.0600) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(3.5000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -3.0000, 0.0000)) - # Disc parameters + p0.emitter.setRadius(0.2000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -30.0000), LinearDistanceForce.FTONEOVERRSQUARED, 3.0400, 1.5000, 1) force0.setActive(1) f0.addForce(force0) @@ -1887,7 +1844,7 @@ def headShrinkCloud(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("SphereSurfaceEmitter") @@ -1898,35 +1855,34 @@ def headShrinkCloud(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.3000) p0.factory.setLifespanSpread(0.100) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(1, 0.84, 0, 1.00)) p0.renderer.setEdgeColor(Vec4(1, 1, 1, 0.3)) p0.renderer.setBirthRadius(0.1500) p0.renderer.setDeathRadius(0.0000) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(4.0000) p0.emitter.setAmplitudeSpread(2.5000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Surface parameters + p0.emitter.setRadius(0.0200) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(33.2697, 0) force0.setActive(1) f0.addForce(force0) @@ -1940,7 +1896,7 @@ def firedFlame(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(2.500, 4.500, 2.500) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -1951,18 +1907,17 @@ def firedFlame(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.500) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/fire") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -1976,14 +1931,14 @@ def firedFlame(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 4.800)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -30.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.4000) self.addParticles(p0) @@ -1995,7 +1950,7 @@ def spinSpray(self): self.setHpr(50.000, -0.000, -90.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -2006,18 +1961,17 @@ def spinSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.2000) p0.factory.setLifespanSpread(0.2000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/snow-particle") p0.renderer.setColor(Vec4(1.00, 0.00, 0.00, 1.00)) @@ -2031,18 +1985,18 @@ def spinSpray(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(6.0000) p0.emitter.setAmplitudeSpread(0.7000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -4.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.200) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -3.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 2.5308, 1) force0.setActive(1) f0.addForce(force0) @@ -2059,7 +2013,7 @@ def confetti(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("DiscEmitter") @@ -2070,21 +2024,18 @@ def confetti(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.7000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) - #p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/spark") - #p0.renderer.addTextureFromFile('confetti.png') p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setXScaleFlag(1) p0.renderer.setYScaleFlag(1) @@ -2096,21 +2047,18 @@ def confetti(self): p0.renderer.setNonanimatedTheta(145.0080) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - #p0.renderer.getColorInterpolationManager().addSinusoid(0.0,0.60000002384185791,Vec4(1.0,0.0,0.0,1.0),Vec4(0.0,1.0,0.0,1.0),0.30000001192092896,1) - #p0.renderer.getColorInterpolationManager().addSinusoid(0.5,1.0,Vec4(0.0,0.0,1.0,1.0),Vec4(1.0,0.0,0.0,1.0),0.30000001192092896,1) - #p0.renderer.getColorInterpolationManager().addSinusoid(0.0,1.0,Vec4(1.0,0.0,0.0,1.0),Vec4(0.0,1.0,0.0,1.0),0.5,0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Disc parameters + p0.emitter.setRadius(0.0100) self.addParticles(p0) f0 = ForceGroup.ForceGroup('gravity') - # Force parameters + force0 = LinearJitterForce(5.0000, 0) force0.setVectorMasks(1, 1, 1) force0.setActive(1) @@ -2128,7 +2076,7 @@ def downsizeCloud(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -2139,18 +2087,17 @@ def downsizeCloud(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.3000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/snow-particle") p0.renderer.setColor(Vec4(1.00, 1.00, 0.00, 0.80)) @@ -2164,18 +2111,18 @@ def downsizeCloud(self): p0.renderer.setNonanimatedTheta(20.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(-1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(2.70) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(14.5449, 0) force0.setActive(1) f0.addForce(force0) @@ -2189,7 +2136,7 @@ def synergyWaterfall(self): self.setHpr(0.000, -45.000, 0.000) self.setScale(4.000, 4.000, 4.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("DiscEmitter") @@ -2200,18 +2147,17 @@ def synergyWaterfall(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.1000) p0.factory.setLifespanSpread(0.1000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/dollar-sign") p0.renderer.setColor(Vec4(0.00, 1.00, 0.00, 1.00)) @@ -2225,18 +2171,18 @@ def synergyWaterfall(self): p0.renderer.setNonanimatedTheta(20.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(3.5000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -3.0000, 0.0000)) - # Disc parameters + p0.emitter.setRadius(0.2000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -15.0000), LinearDistanceForce.FTONEOVERRSQUARED, 3.0400, 1.5000, 1) force0.setActive(1) f0.addForce(force0) @@ -2250,7 +2196,7 @@ def calculate(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -2261,18 +2207,17 @@ def calculate(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.9000) p0.factory.setLifespanSpread(0.2000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.3000) p0.factory.setTerminalVelocityBase(8.0000) p0.factory.setTerminalVelocitySpread(4.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/audit-plus") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -2286,14 +2231,14 @@ def calculate(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(11.0000) p0.emitter.setAmplitudeSpread(2.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -2.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.5000) self.addParticles(p0) @@ -2305,7 +2250,7 @@ def freezeAssets(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("DiscEmitter") @@ -2316,18 +2261,17 @@ def freezeAssets(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.7000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/snow-particle") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -2341,18 +2285,18 @@ def freezeAssets(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(8.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 5.0000)) - # Disc parameters + p0.emitter.setRadius(0.4500) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(15.0000, 0) force0.setActive(1) f0.addForce(force0) @@ -2366,7 +2310,7 @@ def spriteFiredFlecks(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -2377,18 +2321,17 @@ def spriteFiredFlecks(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.100) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/roll-o-dex") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -2402,14 +2345,14 @@ def spriteFiredFlecks(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 4.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -4.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(1.5000) self.addParticles(p0) @@ -2419,9 +2362,8 @@ def smile(self): self.reset() self.setPos(0.0, 0.0, 2.000) self.setHpr(85.000, 0.000, 90.000) - #self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("RingEmitter") @@ -2432,31 +2374,30 @@ def smile(self): p0.setSystemLifespan(1.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.0000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(200.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setEdgeColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setBirthRadius(0.1000) p0.renderer.setDeathRadius(0.0000) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Ring parameters + p0.emitter.setRadius(1.0000) self.addParticles(p0) @@ -2468,7 +2409,7 @@ def trickleLiquidate(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -2479,18 +2420,17 @@ def trickleLiquidate(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.4000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/raindrop") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -2504,14 +2444,14 @@ def trickleLiquidate(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(16.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 6.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.4500) self.addParticles(p0) @@ -2523,10 +2463,9 @@ def reorgSpray(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") - #p0.setRenderer("PointParticleRenderer") p0.setEmitter("SphereVolumeEmitter") p0.setPoolSize(150) p0.setBirthRate(0.0500) @@ -2535,18 +2474,17 @@ def reorgSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.8000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/snow-particle") p0.renderer.setColor(Vec4(1.00, 0.00, 0.00, 1.00)) @@ -2560,14 +2498,14 @@ def reorgSpray(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(3.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 6.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -4.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.8900) self.addParticles(p0) @@ -2579,7 +2517,7 @@ def liquidate(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -2590,18 +2528,17 @@ def liquidate(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.4000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/raindrop") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -2615,14 +2552,14 @@ def liquidate(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(16.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 6.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.4500) self.addParticles(p0) @@ -2634,7 +2571,7 @@ def mumboJumboSpray(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 4.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -2645,18 +2582,17 @@ def mumboJumboSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.900) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/mumbojumbo-iron") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -2670,18 +2606,18 @@ def mumboJumboSpray(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(6.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -9.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.7000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(20.4636, 0) force0.setActive(1) f0.addForce(force0) @@ -2695,7 +2631,7 @@ def gearExplosionWide(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -2706,18 +2642,17 @@ def gearExplosionWide(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(4.2000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/gear") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -2731,18 +2666,18 @@ def gearExplosionWide(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(15.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 10.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -0.5000)) - # Sphere Volume parameters + p0.emitter.setRadius(1.7500) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -79.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0000, 1) force0.setActive(1) f0.addForce(force0) @@ -2756,7 +2691,7 @@ def pixieSpray(self): self.setHpr(-90.000, 45.000, 0.000) self.setScale(4.000, 4.000, 4.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("DiscEmitter") @@ -2767,35 +2702,34 @@ def pixieSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.6000) p0.factory.setLifespanSpread(0.1000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setEdgeColor(Vec4(0.00, 0.00, 1.00, 1.00)) p0.renderer.setBirthRadius(0.0200) p0.renderer.setDeathRadius(0.0500) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(3.5000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -3.0000, 0.0000)) - # Disc parameters + p0.emitter.setRadius(0.100) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -30.0000), LinearDistanceForce.FTONEOVERRSQUARED, 3.0400, 1.5000, 1) force0.setActive(1) f0.addForce(force0) @@ -2809,7 +2743,7 @@ def synergy(self): self.setHpr(90.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("RingEmitter") @@ -2820,18 +2754,17 @@ def synergy(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.6) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/dollar-sign") p0.renderer.setColor(Vec4(0.00, 1.00, 0.00, 1.00)) @@ -2845,18 +2778,18 @@ def synergy(self): p0.renderer.setNonanimatedTheta(20.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(5.0697) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(-4.0000, 0.0000, 0.0000)) - # Ring parameters + p0.emitter.setRadius(1.8607) self.addParticles(p0) f0 = ForceGroup.ForceGroup('jfo') - # Force parameters + force0 = LinearJitterForce(1.0000, 0) force0.setActive(1) f0.addForce(force0) @@ -2870,7 +2803,7 @@ def soundWave(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(7.000, 7.000, 7.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("PointEmitter") @@ -2881,20 +2814,18 @@ def soundWave(self): p0.setSystemLifespan(10.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(4.0000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(0.0010) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(0.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setTextureFromNode("phase_5/models/props/uberSoundEffects", "**/Circle") - #p0.renderer.addTextureFromFile('maps/Circle.tif') p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setXScaleFlag(1) p0.renderer.setYScaleFlag(1) @@ -2907,14 +2838,14 @@ def soundWave(self): p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(1) p0.renderer.setColorBlendMode(ColorBlendAttrib.MAdd, ColorBlendAttrib.OIncomingAlpha, ColorBlendAttrib.OOne) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETEXPLICIT) p0.emitter.setAmplitude(0.0100) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Point parameters + p0.emitter.setLocation(Point3(0.0000, 0.0000, 0.0000)) self.addParticles(p0) @@ -2926,7 +2857,7 @@ def tnt(self): self.setHpr(0.000, 10.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -2937,18 +2868,17 @@ def tnt(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.2000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/spark") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -2962,24 +2892,18 @@ def tnt(self): p0.renderer.setNonanimatedTheta(20.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Sparkle parameters - #p0.renderer.setCenterColor(Vec4(0.78, 0.78, 0, 1.00)) - #p0.renderer.setEdgeColor(Vec4(0.78, 0.78, 0, 1.00)) - #p0.renderer.setBirthRadius(0.0600) - #p0.renderer.setDeathRadius(0.0600) - #p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.5000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -2.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.2282) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -19.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0100, 1) force0.setActive(1) f0.addForce(force0) @@ -2993,7 +2917,7 @@ def doubleTalkLeft(self): self.setHpr(55.000, 0.000, 0.000) self.setScale(3.000, 3.000, 3.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -3004,18 +2928,17 @@ def doubleTalkLeft(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.7000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/doubletalk-double") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -3029,18 +2952,18 @@ def doubleTalkLeft(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(12.000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.6000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -8.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.0500) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(6.000, -3.0000, 0.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 1.5000, 1) force0.setActive(1) f0.addForce(force0) @@ -3054,7 +2977,7 @@ def pixieWall(self): self.setHpr(-90.000, 90.000, -180.000) self.setScale(1.50) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("DiscEmitter") @@ -3065,35 +2988,34 @@ def pixieWall(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(4.0000) p0.factory.setLifespanSpread(0.2000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setEdgeColor(Vec4(0.00, 0.00, 1.00, 1.00)) p0.renderer.setBirthRadius(0.0400) p0.renderer.setDeathRadius(0.0000) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(2.5000) p0.emitter.setAmplitudeSpread(0.5000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(0.0000, 0.0000, 1.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -1.0000)) - # Disc parameters + p0.emitter.setRadius(0.5000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearNoiseForce(0.0500, 0) force0.setActive(1) f0.addForce(force0) @@ -3107,7 +3029,7 @@ def schmoozeUpperSpray(self): self.setHpr(0.000, 55.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -3118,18 +3040,17 @@ def schmoozeUpperSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.900) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/schmooze-master") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -3143,18 +3064,18 @@ def schmoozeUpperSpray(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(5.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 11.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -1.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.1000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, -23.0000, -9.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 1.3661, 1) force0.setActive(1) f0.addForce(force0) @@ -3168,7 +3089,7 @@ def firedBaseFlame(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(2.500, 4.500, 2.500) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -3179,18 +3100,17 @@ def firedBaseFlame(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.100) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/fire") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -3204,14 +3124,14 @@ def firedBaseFlame(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 2.200)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -30.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.4000) self.addParticles(p0) @@ -3223,46 +3143,45 @@ def headShrinkSpray(self): self.setHpr(0.000, 60.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("SphereVolumeEmitter") - p0.setPoolSize(60) #60) + p0.setPoolSize(60) p0.setBirthRate(0.1000) p0.setLitterSize(4) p0.setLitterSpread(2) p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters - p0.factory.setLifespanBase(1.15) #1.1200) + + p0.factory.setLifespanBase(1.15) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(1, 0.84, 0, 1.00)) p0.renderer.setEdgeColor(Vec4(1, 1, 1, 0.3)) p0.renderer.setBirthRadius(0.1500) p0.renderer.setDeathRadius(0.0000) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(12.0000) p0.emitter.setAmplitudeSpread(0.9000) p0.emitter.setOffsetForce(Vec3(0.0000, 5.1000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -4.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.4800) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -4.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 2.5308, 1) force0.setActive(1) f0.addForce(force0) @@ -3279,7 +3198,7 @@ def jargonSpray(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("LineEmitter") @@ -3290,18 +3209,17 @@ def jargonSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.0000) p0.factory.setLifespanSpread(0.2000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/jargon-brow") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -3315,19 +3233,19 @@ def jargonSpray(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(5.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 4.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -9.0000, 0.0000)) - # Line parameters + p0.emitter.setEndpoint1(Point3(0.0000, 0.0000, 0.0000)) p0.emitter.setEndpoint2(Point3(0.0000, 0.0000, 0.0000)) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(2.1279, 0) force0.setActive(1) f0.addForce(force0) @@ -3341,7 +3259,7 @@ def legaleseSpray(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -3352,18 +3270,17 @@ def legaleseSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(3.0000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/buzzwords-crash") p0.renderer.setColor(Vec4(0.00, 0.00, 0.00, 1.00)) @@ -3377,18 +3294,18 @@ def legaleseSpray(self): p0.renderer.setNonanimatedTheta(20.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(8.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 7.0000, -1.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -3.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.0010) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(19.5449, 0) force0.setActive(1) f0.addForce(force0) @@ -3402,7 +3319,7 @@ def powertrip(self): self.setHpr(-90.000, 0.000, 0.000) self.setScale(4.800, 4.800, 4.800) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -3413,36 +3330,34 @@ def powertrip(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.2500) p0.factory.setLifespanSpread(0.050) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters p0.renderer.setCenterColor(Vec4(0.1, 0.95, 0.2, 1.00)) p0.renderer.setEdgeColor(Vec4(0, 0, 0, 1.00)) p0.renderer.setBirthRadius(0.1000) p0.renderer.setDeathRadius(15.0000) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(2.4000) p0.emitter.setAmplitudeSpread(1.1000) p0.emitter.setOffsetForce(Vec3(0.0000, 1.1000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -4.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.120) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(10.0000, 0.0000, 0.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 2.5308, 1) force0.setActive(1) f0.addForce(force0) @@ -3460,7 +3375,7 @@ def spinEffect(self): self.reset() self.setScale(0.040, 0.040, 0.040) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -3471,18 +3386,17 @@ def spinEffect(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.3000) p0.factory.setLifespanSpread(0.3000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/snow-particle") p0.renderer.setColor(Vec4(1.00, 0.00, 0.00, 1.00)) @@ -3496,18 +3410,18 @@ def spinEffect(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(4.000*1.2) p0.emitter.setAmplitudeSpread(1.000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -4.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.300) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 1.2000, 0.0000), LinearDistanceForce.FTONEOVERRSQUARED,1.0000, 20, 1) force0.setActive(1) f0.addForce(force0) @@ -3524,10 +3438,9 @@ def restrainingOrderCloud(self): self.setHpr(-180.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") - #p0.setRenderer("PointParticleRenderer") p0.setEmitter("SphereVolumeEmitter") p0.setPoolSize(60) p0.setBirthRate(0.0001) @@ -3536,18 +3449,17 @@ def restrainingOrderCloud(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.2000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/roll-o-dex") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -3561,14 +3473,14 @@ def restrainingOrderCloud(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(3.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 6.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -18.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.8900) self.addParticles(p0) @@ -3580,7 +3492,7 @@ def numberSpill(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.100, 1.100, 1.100) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -3591,18 +3503,17 @@ def numberSpill(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(5.8000) p0.factory.setLifespanSpread(0.4000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/raindrop") p0.renderer.setColor(Vec4(0, 0, 0, 1.00)) @@ -3616,18 +3527,18 @@ def numberSpill(self): p0.renderer.setNonanimatedTheta(90.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(2.0000) p0.emitter.setAmplitudeSpread(1.300) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -2.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.3282) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -33.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0100, 1) force0.setActive(1) f0.addForce(force0) @@ -3641,7 +3552,7 @@ def headShrinkDrop(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(2.000, 2.000, 2.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("DiscEmitter") @@ -3652,35 +3563,34 @@ def headShrinkDrop(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.2000) p0.factory.setLifespanSpread(0.2000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(1, 0.84, 0, 1.00)) p0.renderer.setEdgeColor(Vec4(1, 1, 1, 0.3)) p0.renderer.setBirthRadius(0.0400) p0.renderer.setDeathRadius(0.0000) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(2.300) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 4.0000)) - # Disc parameters + p0.emitter.setRadius(0.2800) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(0.060, 0) force0.setActive(1) f0.addForce(force0) @@ -3694,7 +3604,7 @@ def rollodexWaterfall(self): self.setHpr(89.908, -20.000, 179.476) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereSurfaceEmitter") @@ -3705,18 +3615,17 @@ def rollodexWaterfall(self): p0.setSystemLifespan(5.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.5000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/rollodex-card") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -3730,18 +3639,18 @@ def rollodexWaterfall(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Surface parameters + p0.emitter.setRadius(1.0000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forward') - # Force parameters + force0 = LinearSourceForce(Point3(0.0000, 0.0000, 0.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 1.0000, 1) force0.setActive(0) f0.addForce(force0) @@ -3758,7 +3667,7 @@ def rollodexStream(self): self.setHpr(89.908, -20.000, 179.476) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("PointEmitter") @@ -3769,18 +3678,17 @@ def rollodexStream(self): p0.setSystemLifespan(5.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.0000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(3.0000) p0.factory.setMassSpread(2.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/rollodex-card") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -3794,18 +3702,18 @@ def rollodexStream(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETEXPLICIT) p0.emitter.setAmplitude(-15.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Point parameters + p0.emitter.setLocation(Point3(0.0000, 0.0000, 0.0000)) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forward') - # Force parameters + force0 = LinearSourceForce(Point3(0.0000, 0.0000, 0.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 1.0000, 1) force0.setActive(1) f0.addForce(force0) @@ -3822,7 +3730,7 @@ def shiftSpray(self): self.setHpr(0.000, -55.000, 0.000) self.setScale(9.000, 9.000, 9.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("LineEmitter") @@ -3833,24 +3741,23 @@ def shiftSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.3000) p0.factory.setLifespanSpread(0.1000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(1.00, 1.00, 0.00, 0.9)) p0.renderer.setEdgeColor(Vec4(1.00, 1.00, 0.00, 0.6)) p0.renderer.setBirthRadius(0.0200) p0.renderer.setDeathRadius(0.0600) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(3.5000) p0.emitter.setAmplitudeSpread(0.5000) @@ -3859,7 +3766,7 @@ def shiftSpray(self): p0.emitter.setRadiateOrigin(Point3(0.0000, -3.0000, 0.0000)) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, 96.0000), LinearDistanceForce.FTONEOVERRSQUARED, 3.0400, 1.5000, 1) force0.setActive(1) f0.addForce(force0) @@ -3873,7 +3780,7 @@ def pixieDrop(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(2.000, 2.000, 2.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("DiscEmitter") @@ -3884,35 +3791,34 @@ def pixieDrop(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(2.2000) p0.factory.setLifespanSpread(0.2000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setEdgeColor(Vec4(0.00, 0.00, 1.00, 1.00)) p0.renderer.setBirthRadius(0.0400) p0.renderer.setDeathRadius(0.0000) p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 4.0000)) - # Disc parameters + p0.emitter.setRadius(0.3000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearJitterForce(3.6003, 0) force0.setActive(1) f0.addForce(force0) @@ -3922,11 +3828,11 @@ def pixieDrop(self): @particle def hotAirSpray(self): self.reset() - self.setPos(0.000, 2.500, 3.200) # originally (0,4,4) + self.setPos(0.000, 2.500, 3.200) self.setHpr(-180.000, 80.000, -180.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -3937,18 +3843,17 @@ def hotAirSpray(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.6000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/fire") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -3962,18 +3867,18 @@ def hotAirSpray(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(2.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 5.1000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, -4.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.0200) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -4.0000), LinearDistanceForce.FTONEOVERRSQUARED, 1.0000, 2.5308, 1) force0.setActive(1) f0.addForce(force0) @@ -3990,7 +3895,7 @@ def resistanceEffectSparkle(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SparkleParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -4001,35 +3906,34 @@ def resistanceEffectSparkle(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(3.0000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Sparkle parameters + p0.renderer.setCenterColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setEdgeColor(Vec4(0.00, 0.00, 1.00, 1.00)) p0.renderer.setBirthRadius(0.2000) p0.renderer.setDeathRadius(0.1000) p0.renderer.setLifeScale(SparkleParticleRenderer.SPSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(20.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(2.0000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -79.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0000, 1) force0.setActive(1) f0.addForce(force0) @@ -4043,7 +3947,7 @@ def tt_p_efx_rocketLaunchFire(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("LineEmitter") @@ -4054,19 +3958,17 @@ def tt_p_efx_rocketLaunchFire(self): p0.setSystemLifespan(1.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.5000) p0.factory.setLifespanSpread(0.1000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(0.69) - # Sprite parameters - # p0.renderer.addTextureFromFile('../../ttmodels/src/maps/tt_t_efx_fireball.tif') + p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setXScaleFlag(1) p0.renderer.setYScaleFlag(1) @@ -4079,19 +3981,19 @@ def tt_p_efx_rocketLaunchFire(self): p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) p0.renderer.getColorInterpolationManager().addLinear(0.10999999940395355,1.0,Vec4(1.0,1.0,1.0,1.0),Vec4(0.729411780834198,0.40392157435417175,0.11372549086809158,1.0),1) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, -10.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Line parameters + p0.emitter.setEndpoint1(Point3(1.0000, 0.0000, 0.0000)) p0.emitter.setEndpoint2(Point3(0.0000, 0.0000, 0.0000)) self.addParticles(p0) f0 = ForceGroup.ForceGroup('Gravity') - # Force parameters + force0 = LinearVectorForce(Vec3(0.0000, 0.0000, 2.5000), 1.0000, 0) force0.setVectorMasks(1, 1, 1) force0.setActive(1) @@ -4110,7 +4012,7 @@ def icetnt(self): self.setHpr(0.000, 10.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -4121,18 +4023,17 @@ def icetnt(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.2000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/spark") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -4146,24 +4047,18 @@ def icetnt(self): p0.renderer.setNonanimatedTheta(20.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Sparkle parameters - #p0.renderer.setCenterColor(Vec4(0.78, 0.78, 0, 1.00)) - #p0.renderer.setEdgeColor(Vec4(0.78, 0.78, 0, 1.00)) - #p0.renderer.setBirthRadius(0.0600) - #p0.renderer.setDeathRadius(0.0600) - #p0.renderer.setLifeScale(SparkleParticleRenderer.SPNOSCALE) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(1.5000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -2.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(0.2282) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -19.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0100, 1) force0.setActive(1) f0.addForce(force0) @@ -4177,7 +4072,7 @@ def resistanceEffectSprite(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -4188,18 +4083,17 @@ def resistanceEffectSprite(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(3.0000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setXScaleFlag(0) p0.renderer.setYScaleFlag(0) @@ -4211,18 +4105,18 @@ def resistanceEffectSprite(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(20.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(2.0000) self.addParticles(p0) p1 = Particles.Particles('particles-2') - # Particles parameters + p1.setFactory("PointParticleFactory") p1.setRenderer("SpriteParticleRenderer") p1.setEmitter("SphereVolumeEmitter") @@ -4233,18 +4127,17 @@ def resistanceEffectSprite(self): p1.setSystemLifespan(0.0000) p1.setLocalVelocityFlag(1) p1.setSystemGrowsOlderFlag(0) - # Factory parameters + p1.factory.setLifespanBase(3.0000) p1.factory.setLifespanSpread(0.0000) p1.factory.setMassBase(1.0000) p1.factory.setMassSpread(0.0000) p1.factory.setTerminalVelocityBase(400.0000) p1.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p1.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p1.renderer.setUserAlpha(1.00) - # Sprite parameters + p1.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p1.renderer.setXScaleFlag(0) p1.renderer.setYScaleFlag(0) @@ -4256,18 +4149,18 @@ def resistanceEffectSprite(self): p1.renderer.setNonanimatedTheta(0.0000) p1.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p1.renderer.setAlphaDisable(0) - # Emitter parameters + p1.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p1.emitter.setAmplitude(20.0000) p1.emitter.setAmplitudeSpread(0.0000) p1.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p1.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p1.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p1.emitter.setRadius(2.0000) self.addParticles(p1) p2 = Particles.Particles('particles-3') - # Particles parameters + p2.setFactory("PointParticleFactory") p2.setRenderer("SpriteParticleRenderer") p2.setEmitter("SphereVolumeEmitter") @@ -4278,18 +4171,17 @@ def resistanceEffectSprite(self): p2.setSystemLifespan(0.0000) p2.setLocalVelocityFlag(1) p2.setSystemGrowsOlderFlag(0) - # Factory parameters + p2.factory.setLifespanBase(3.0000) p2.factory.setLifespanSpread(0.0000) p2.factory.setMassBase(1.0000) p2.factory.setMassSpread(0.0000) p2.factory.setTerminalVelocityBase(400.0000) p2.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p2.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p2.renderer.setUserAlpha(1.00) - # Sprite parameters + p2.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p2.renderer.setXScaleFlag(0) p2.renderer.setYScaleFlag(0) @@ -4301,18 +4193,18 @@ def resistanceEffectSprite(self): p2.renderer.setNonanimatedTheta(0.0000) p2.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p2.renderer.setAlphaDisable(0) - # Emitter parameters + p2.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p2.emitter.setAmplitude(20.0000) p2.emitter.setAmplitudeSpread(0.0000) p2.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p2.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p2.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p2.emitter.setRadius(2.0000) self.addParticles(p2) p3 = Particles.Particles('particles-4') - # Particles parameters + p3.setFactory("PointParticleFactory") p3.setRenderer("SpriteParticleRenderer") p3.setEmitter("SphereVolumeEmitter") @@ -4323,18 +4215,17 @@ def resistanceEffectSprite(self): p3.setSystemLifespan(0.0000) p3.setLocalVelocityFlag(1) p3.setSystemGrowsOlderFlag(0) - # Factory parameters + p3.factory.setLifespanBase(3.0000) p3.factory.setLifespanSpread(0.0000) p3.factory.setMassBase(1.0000) p3.factory.setMassSpread(0.0000) p3.factory.setTerminalVelocityBase(400.0000) p3.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p3.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p3.renderer.setUserAlpha(1.00) - # Sprite parameters + p3.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p3.renderer.setXScaleFlag(0) p3.renderer.setYScaleFlag(0) @@ -4346,18 +4237,18 @@ def resistanceEffectSprite(self): p3.renderer.setNonanimatedTheta(0.0000) p3.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p3.renderer.setAlphaDisable(0) - # Emitter parameters + p3.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p3.emitter.setAmplitude(20.0000) p3.emitter.setAmplitudeSpread(0.0000) p3.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p3.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p3.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p3.emitter.setRadius(2.0000) self.addParticles(p3) p4 = Particles.Particles('particles-5') - # Particles parameters + p4.setFactory("PointParticleFactory") p4.setRenderer("SpriteParticleRenderer") p4.setEmitter("SphereVolumeEmitter") @@ -4368,18 +4259,17 @@ def resistanceEffectSprite(self): p4.setSystemLifespan(0.0000) p4.setLocalVelocityFlag(1) p4.setSystemGrowsOlderFlag(0) - # Factory parameters + p4.factory.setLifespanBase(3.0000) p4.factory.setLifespanSpread(0.0000) p4.factory.setMassBase(1.0000) p4.factory.setMassSpread(0.0000) p4.factory.setTerminalVelocityBase(400.0000) p4.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p4.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p4.renderer.setUserAlpha(1.00) - # Sprite parameters + p4.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p4.renderer.setXScaleFlag(0) p4.renderer.setYScaleFlag(0) @@ -4391,18 +4281,18 @@ def resistanceEffectSprite(self): p4.renderer.setNonanimatedTheta(0.0000) p4.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p4.renderer.setAlphaDisable(0) - # Emitter parameters + p4.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p4.emitter.setAmplitude(20.0000) p4.emitter.setAmplitudeSpread(0.0000) p4.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p4.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p4.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p4.emitter.setRadius(2.0000) self.addParticles(p4) p5 = Particles.Particles('particles-6') - # Particles parameters + p5.setFactory("PointParticleFactory") p5.setRenderer("SpriteParticleRenderer") p5.setEmitter("SphereVolumeEmitter") @@ -4413,18 +4303,17 @@ def resistanceEffectSprite(self): p5.setSystemLifespan(0.0000) p5.setLocalVelocityFlag(1) p5.setSystemGrowsOlderFlag(0) - # Factory parameters + p5.factory.setLifespanBase(3.0000) p5.factory.setLifespanSpread(0.0000) p5.factory.setMassBase(1.0000) p5.factory.setMassSpread(0.0000) p5.factory.setTerminalVelocityBase(400.0000) p5.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p5.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p5.renderer.setUserAlpha(1.00) - # Sprite parameters + p5.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p5.renderer.setXScaleFlag(0) p5.renderer.setYScaleFlag(0) @@ -4436,18 +4325,18 @@ def resistanceEffectSprite(self): p5.renderer.setNonanimatedTheta(0.0000) p5.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p5.renderer.setAlphaDisable(0) - # Emitter parameters + p5.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p5.emitter.setAmplitude(20.0000) p5.emitter.setAmplitudeSpread(0.0000) p5.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p5.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p5.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p5.emitter.setRadius(2.0000) self.addParticles(p5) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -79.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0000, 1) force0.setActive(1) f0.addForce(force0) @@ -4461,7 +4350,7 @@ def splashlines(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("LineParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -4472,32 +4361,31 @@ def splashlines(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(2.0) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Line parameters + p0.renderer.setHeadColor(Vec4(0.02, 0.67, 0.92, 1.00)) p0.renderer.setTailColor(Vec4(1.00, 1.00, 1.00, 1.00)) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(9.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 9.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, -2.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(3.2282) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -79.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0100, 1) force0.setActive(1) f0.addForce(force0) @@ -4511,7 +4399,7 @@ def resistanceEffectBean(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("GeomParticleRenderer") p0.setEmitter("SphereVolumeEmitter") @@ -4522,31 +4410,28 @@ def resistanceEffectBean(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(3.0000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p0.renderer.setUserAlpha(1.00) - # Geom parameters - #p0.renderer.setGeomNode(jellybean4.egg) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(20.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setRadius(2.0000) self.addParticles(p0) p1 = Particles.Particles('particles-2') - # Particles parameters + p1.setFactory("PointParticleFactory") p1.setRenderer("GeomParticleRenderer") p1.setEmitter("SphereVolumeEmitter") @@ -4557,31 +4442,28 @@ def resistanceEffectBean(self): p1.setSystemLifespan(0.0000) p1.setLocalVelocityFlag(1) p1.setSystemGrowsOlderFlag(0) - # Factory parameters + p1.factory.setLifespanBase(3.0000) p1.factory.setLifespanSpread(0.0000) p1.factory.setMassBase(1.0000) p1.factory.setMassSpread(0.0000) p1.factory.setTerminalVelocityBase(400.0000) p1.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p1.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p1.renderer.setUserAlpha(1.00) - # Geom parameters - #p1.renderer.setGeomNode(jellybean4.egg) - # Emitter parameters + p1.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p1.emitter.setAmplitude(20.0000) p1.emitter.setAmplitudeSpread(0.0000) p1.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p1.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p1.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p1.emitter.setRadius(2.0000) self.addParticles(p1) p2 = Particles.Particles('particles-3') - # Particles parameters + p2.setFactory("PointParticleFactory") p2.setRenderer("GeomParticleRenderer") p2.setEmitter("SphereVolumeEmitter") @@ -4592,31 +4474,28 @@ def resistanceEffectBean(self): p2.setSystemLifespan(0.0000) p2.setLocalVelocityFlag(1) p2.setSystemGrowsOlderFlag(0) - # Factory parameters + p2.factory.setLifespanBase(3.0000) p2.factory.setLifespanSpread(0.0000) p2.factory.setMassBase(1.0000) p2.factory.setMassSpread(0.0000) p2.factory.setTerminalVelocityBase(400.0000) p2.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p2.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p2.renderer.setUserAlpha(1.00) - # Geom parameters - #p2.renderer.setGeomNode(jellybean4.egg) - # Emitter parameters + p2.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p2.emitter.setAmplitude(20.0000) p2.emitter.setAmplitudeSpread(0.0000) p2.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p2.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p2.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p2.emitter.setRadius(2.0000) self.addParticles(p2) p3 = Particles.Particles('particles-4') - # Particles parameters + p3.setFactory("PointParticleFactory") p3.setRenderer("GeomParticleRenderer") p3.setEmitter("SphereVolumeEmitter") @@ -4627,31 +4506,28 @@ def resistanceEffectBean(self): p3.setSystemLifespan(0.0000) p3.setLocalVelocityFlag(1) p3.setSystemGrowsOlderFlag(0) - # Factory parameters + p3.factory.setLifespanBase(3.0000) p3.factory.setLifespanSpread(0.0000) p3.factory.setMassBase(1.0000) p3.factory.setMassSpread(0.0000) p3.factory.setTerminalVelocityBase(400.0000) p3.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p3.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p3.renderer.setUserAlpha(1.00) - # Geom parameters - #p3.renderer.setGeomNode(jellybean4.egg) - # Emitter parameters + p3.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p3.emitter.setAmplitude(20.0000) p3.emitter.setAmplitudeSpread(0.0000) p3.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p3.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p3.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p3.emitter.setRadius(2.0000) self.addParticles(p3) p4 = Particles.Particles('particles-5') - # Particles parameters + p4.setFactory("PointParticleFactory") p4.setRenderer("GeomParticleRenderer") p4.setEmitter("SphereVolumeEmitter") @@ -4662,31 +4538,28 @@ def resistanceEffectBean(self): p4.setSystemLifespan(0.0000) p4.setLocalVelocityFlag(1) p4.setSystemGrowsOlderFlag(0) - # Factory parameters + p4.factory.setLifespanBase(3.0000) p4.factory.setLifespanSpread(0.0000) p4.factory.setMassBase(1.0000) p4.factory.setMassSpread(0.0000) p4.factory.setTerminalVelocityBase(400.0000) p4.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p4.renderer.setAlphaMode(BaseParticleRenderer.PRALPHANONE) p4.renderer.setUserAlpha(1.00) - # Geom parameters - #p4.renderer.setGeomNode(jellybean4.egg) - # Emitter parameters + p4.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p4.emitter.setAmplitude(20.0000) p4.emitter.setAmplitudeSpread(0.0000) p4.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 20.0000)) p4.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p4.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p4.emitter.setRadius(2.0000) self.addParticles(p4) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -79.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 95.0000, 1) force0.setActive(1) f0.addForce(force0) @@ -4700,7 +4573,7 @@ def tt_p_efx_rocketLaunchSmoke(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(2.000, 2.000, 3.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("DiscEmitter") @@ -4711,19 +4584,17 @@ def tt_p_efx_rocketLaunchSmoke(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(4.0000) p0.factory.setLifespanSpread(0.1000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAINOUT) p0.renderer.setUserAlpha(0.47) - # Sprite parameters - #p0.renderer.addTextureFromFile('../../ttmodels/src/maps/tt_t_efx_smoke.tif') + p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setXScaleFlag(1) p0.renderer.setYScaleFlag(1) @@ -4736,18 +4607,18 @@ def tt_p_efx_rocketLaunchSmoke(self): p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) p0.renderer.getColorInterpolationManager().addLinear(0.0,1.0,Vec4(1.0,1.0,1.0,1.0),Vec4(0.58823531866073608,0.58823531866073608,0.58823531866073608,1.0),1) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(0.4000) p0.emitter.setAmplitudeSpread(2.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, -5.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Disc parameters + p0.emitter.setRadius(1.0000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('Gravity') - # Force parameters + force0 = LinearVectorForce(Vec3(0.0000, 0.0000, 2.5000), 1.0000, 0) force0.setVectorMasks(1, 1, 1) force0.setActive(1) @@ -4762,7 +4633,7 @@ def sparks(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("LineEmitter") @@ -4773,18 +4644,17 @@ def sparks(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.5000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setXScaleFlag(1) p0.renderer.setYScaleFlag(1) @@ -4796,19 +4666,19 @@ def sparks(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(1) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETEXPLICIT) p0.emitter.setAmplitude(0.0000) p0.emitter.setAmplitudeSpread(10.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 1.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(0.0000, 0.0000, 1.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Line parameters + p0.emitter.setEndpoint1(Point3(0.5000, 5.0000, -0.5000)) p0.emitter.setEndpoint2(Point3(0.75000, -5.0000, 2.5000)) self.addParticles(p0) f0 = ForceGroup.ForceGroup('sparkforces') - # Force parameters + force0 = LinearVectorForce(Vec3(1.0000, 0.0000, 0.0000), -50.0000, 0) force0.setActive(1) f0.addForce(force0) @@ -4831,7 +4701,7 @@ def drift(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("ZSpinParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("PointEmitter") @@ -4842,14 +4712,14 @@ def drift(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(0.1750) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Z Spin factory parameters + p0.factory.enableAngularVelocity(1) p0.factory.setInitialAngle(0.0000) p0.factory.setInitialAngleSpread(45.0000) @@ -4857,10 +4727,9 @@ def drift(self): p0.factory.setFinalAngleSpread(0.0000) p0.factory.setAngularVelocity(0.0000) p0.factory.setAngularVelocitySpread(90.0000) - # Renderer parameters p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAOUT) p0.renderer.setUserAlpha(0.50) - # Sprite parameters + p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) p0.renderer.setXScaleFlag(1) p0.renderer.setYScaleFlag(1) @@ -4872,19 +4741,18 @@ def drift(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - #p0.renderer.setColorBlendMode(ColorBlendAttrib.MAdd,ColorBlendAttrib.OIncomingAlpha,ColorBlendAttrib.OOneMinusIncomingAlpha) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETEXPLICIT) p0.emitter.setAmplitude(1.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Volume parameters + p0.emitter.setLocation(Point3(0.0000,0.0000,0.0000)) self.addParticles(p0) f0 = ForceGroup.ForceGroup('Smoke') - # Force parameters + force0 = LinearVectorForce(Vec3(1.0000, 0.0000, 0.0000), 0.0000, 0) force0.setActive(1) f0.addForce(force0) @@ -4907,7 +4775,7 @@ def snowdisk(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("ZSpinParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("DiscEmitter") @@ -4918,23 +4786,22 @@ def snowdisk(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(4.5000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Z Spin factory parameters + p0.factory.setInitialAngle(0.0000) p0.factory.setInitialAngleSpread(10.0000) p0.factory.enableAngularVelocity(1) p0.factory.setAngularVelocity(0.0000) p0.factory.setAngularVelocitySpread(500.0000) - # Renderer parameters p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAIN) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_8/models/props/snowflake_particle", "**/p1_2") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -4948,18 +4815,18 @@ def snowdisk(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(0.1000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, 0.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Disc parameters + p0.emitter.setRadius(50.0000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('gravity') - # Force parameters + force0 = LinearVectorForce(Vec3(0.0000, 0.0000, -1.0000), 1.5000, 0) force0.setActive(1) f0.addForce(force0) @@ -4976,7 +4843,7 @@ def bossCogFrontAttack(self): self.setHpr(0.000, 0.000, 0.000) self.setScale(1.000, 1.000, 1.000) p0 = Particles.Particles('particles-1') - # Particles parameters + p0.setFactory("PointParticleFactory") p0.setRenderer("SpriteParticleRenderer") p0.setEmitter("SphereSurfaceEmitter") @@ -4987,18 +4854,17 @@ def bossCogFrontAttack(self): p0.setSystemLifespan(0.0000) p0.setLocalVelocityFlag(1) p0.setSystemGrowsOlderFlag(0) - # Factory parameters + p0.factory.setLifespanBase(1.0000) p0.factory.setLifespanSpread(0.0000) p0.factory.setMassBase(1.0000) p0.factory.setMassSpread(0.0000) p0.factory.setTerminalVelocityBase(400.0000) p0.factory.setTerminalVelocitySpread(0.0000) - # Point factory parameters - # Renderer parameters + p0.renderer.setAlphaMode(BaseParticleRenderer.PRALPHAUSER) p0.renderer.setUserAlpha(1.00) - # Sprite parameters + p0.renderer.setIgnoreScale(1) p0.renderer.setTextureFromNode("phase_3.5/models/props/suit-particles", "**/gear") p0.renderer.setColor(Vec4(1.00, 1.00, 1.00, 1.00)) @@ -5012,18 +4878,18 @@ def bossCogFrontAttack(self): p0.renderer.setNonanimatedTheta(0.0000) p0.renderer.setAlphaBlendMethod(BaseParticleRenderer.PPBLENDLINEAR) p0.renderer.setAlphaDisable(0) - # Emitter parameters + p0.emitter.setEmissionType(BaseParticleEmitter.ETRADIATE) p0.emitter.setAmplitude(5.0000) p0.emitter.setAmplitudeSpread(0.0000) p0.emitter.setOffsetForce(Vec3(0.0000, -10.0000, 0.0000)) p0.emitter.setExplicitLaunchVector(Vec3(1.0000, 0.0000, 0.0000)) p0.emitter.setRadiateOrigin(Point3(0.0000, 0.0000, 0.0000)) - # Sphere Surface parameters + p0.emitter.setRadius(1.0000) self.addParticles(p0) f0 = ForceGroup.ForceGroup('forces') - # Force parameters + force0 = LinearSinkForce(Point3(0.0000, 0.0000, -79.0000), LinearDistanceForce.FTONEOVERRSQUARED, 15.9701, 50.0000, 1) force0.setActive(1) f0.addForce(force0) diff --git a/toontown/building/DistributedBuilding.py b/toontown/building/DistributedBuilding.py index b00abfc3..ef35aab2 100644 --- a/toontown/building/DistributedBuilding.py +++ b/toontown/building/DistributedBuilding.py @@ -577,7 +577,6 @@ class DistributedBuilding(DistributedObject.DistributedObject): frontNP.node().setEffect(DecalEffect.make()) suitBuildingNP.setName('cb' + str(self.block) + ':_landmark__DNARoot') suitBuildingNP.setPosHprScale(nodePath, 15.463, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0) - #suitBuildingNP.flattenMedium() suitBuildingNP.setColorScale(0.6, 0.6, 0.6, 1.0) self.loadElevator(suitBuildingNP, cogdo=True) return suitBuildingNP diff --git a/toontown/building/DistributedBuildingAI.py b/toontown/building/DistributedBuildingAI.py index 3a75b4e9..b4c506e7 100644 --- a/toontown/building/DistributedBuildingAI.py +++ b/toontown/building/DistributedBuildingAI.py @@ -296,7 +296,7 @@ class DistributedBuildingAI(DistributedObjectAI.DistributedObjectAI): toon = self.getToon(t) self.air.writeServerEvent('buildingDefeated', t, '%s|%s|%s|%s' % (self.track, self.numFloors, self.zoneId, victorList)) if toon is not None: - self.air.questManager.toonKilledBuilding(toon, self.track, self.difficulty, self.numFloors, self.zoneId, activeToons) + self.air.questManager.toonKilledBuilding(toon, self.track, self.difficulty, self.numFloors, self.zoneId, activeToons, 0) for i in xrange(0, 4): victor = victorList[i] if (victor is None) or (victor not in self.air.doId2do): @@ -333,7 +333,7 @@ class DistributedBuildingAI(DistributedObjectAI.DistributedObjectAI): self.air.writeServerEvent('buildingDefeated', t, '%s|%s|%s|%s' % (self.track, self.numFloors, self.zoneId, victorList)) if toon != None: - #self.air.questManager.toonKilledCogdo(toon, self.track, self.difficulty, self.numFloors, self.zoneId, activeToons) + self.air.questManager.toonKilledBuilding(toon, self.track, self.difficulty, self.numFloors, self.zoneId, activeToons, 1) continue victorList.extend([None, None, None, None]) diff --git a/toontown/quest/Quests.py b/toontown/quest/Quests.py index 5ddaeb34..c3f6943d 100644 --- a/toontown/quest/Quests.py +++ b/toontown/quest/Quests.py @@ -245,6 +245,9 @@ class Quest: def checkBuildingFloors(self, floors): self.check(floors >= 1 and floors <= 5, 'invalid num floors: %s' % floors) + + def checkBuildingType(self, cogdo): + self.check(cogdo != 0 and cogdo != 1, 'invalid cogdo value: %s' % cogdo) def checkNumFactories(self, num): self.check(1, 'invalid num factories: %s' % num) @@ -1018,12 +1021,16 @@ class BuildingQuest(CogQuest): self.checkNumBuildings(self.quest[1]) self.checkBuildingTrack(self.quest[2]) self.checkBuildingFloors(self.quest[3]) + self.checkBuildingType(self.quest[4]) def getNumFloors(self): return self.quest[3] def getBuildingTrack(self): return self.quest[2] + + def isCogdo(self): + return self.quest[4] def getNumQuestItems(self): return self.getNumBuildings() @@ -1047,21 +1054,29 @@ class BuildingQuest(CogQuest): def getObjectiveStrings(self): count = self.getNumBuildings() - floors = TTLocalizer.QuestsBuildingQuestFloorNumbers[self.getNumFloors() - 1] buildingTrack = self.getBuildingTrack() if buildingTrack == Any: type = TTLocalizer.Cog else: type = self.trackNames[self.trackCodes.index(buildingTrack)] - if count == 1: - if floors == '': - text = TTLocalizer.QuestsBuildingQuestDesc + floors = TTLocalizer.QuestsBuildingQuestFloorNumbers[self.getNumFloors() - 1] + + if self.isCogdo(): + if count == 1: + return TTLocalizer.QuestsCogdoQuestDesc else: - text = TTLocalizer.QuestsBuildingQuestDescF - elif floors == '': - text = TTLocalizer.QuestsBuildingQuestDescC + return TTLocalizer.QuestsCogdoQuestDescC else: - text = TTLocalizer.QuestsBuildingQuestDescCF + if count == 1: + if floors == '': + text = TTLocalizer.QuestsBuildingQuestDesc + else: + text = TTLocalizer.QuestsBuildingQuestDescF + elif floors == '': + text = TTLocalizer.QuestsBuildingQuestDescC + else: + text = TTLocalizer.QuestsBuildingQuestDescCF + return (text % {'count': count, 'floors': floors, 'type': type},) @@ -1073,21 +1088,28 @@ class BuildingQuest(CogQuest): if progress >= self.getNumBuildings(): return getFinishToonTaskSCStrings(toNpcId) count = self.getNumBuildings() - floors = TTLocalizer.QuestsBuildingQuestFloorNumbers[self.getNumFloors() - 1] buildingTrack = self.getBuildingTrack() if buildingTrack == Any: type = TTLocalizer.Cog else: type = self.trackNames[self.trackCodes.index(buildingTrack)] - if count == 1: - if floors == '': - text = TTLocalizer.QuestsBuildingQuestDesc + floors = TTLocalizer.QuestsBuildingQuestFloorNumbers[self.getNumFloors() - 1] + + if self.isCogdo(): + if count == 1: + return TTLocalizer.QuestsCogdoQuestDesc else: - text = TTLocalizer.QuestsBuildingQuestDescF - elif floors == '': - text = TTLocalizer.QuestsBuildingQuestDescI + return TTLocalizer.QuestsCogdoQuestDescI else: - text = TTLocalizer.QuestsBuildingQuestDescIF + if count == 1: + if floors == '': + text = TTLocalizer.QuestsBuildingQuestDesc + else: + text = TTLocalizer.QuestsBuildingQuestDescF + elif floors == '': + text = TTLocalizer.QuestsBuildingQuestDescI + else: + text = TTLocalizer.QuestsBuildingQuestDescIF objective = text % {'floors': floors, 'type': type} location = self.getLocationName() @@ -1113,10 +1135,10 @@ class BuildingQuest(CogQuest): class BuildingNewbieQuest(BuildingQuest, NewbieQuest): def __init__(self, id, quest): BuildingQuest.__init__(self, id, quest) - self.checkNewbieLevel(self.quest[4]) + self.checkNewbieLevel(self.quest[5]) def getNewbieLevel(self): - return self.quest[4] + return self.quest[5] def getString(self): return NewbieQuest.getString(self) @@ -2244,14 +2266,14 @@ QuestDict = { 2148: (DD_TIER + 1, Start, (CogTrackQuest, Anywhere, 7, 's'), Any, ToonHQ, Any, NA, DefaultDialog), 2149: (DD_TIER + 1, Start, (CogTrackQuest, Anywhere, 7, 'c'), Any, ToonHQ, Any, NA, DefaultDialog), 2150: (DD_TIER + 1, Start, (CogTrackQuest, Anywhere, 7, 'l'), Any, ToonHQ, Any, NA, DefaultDialog), - 2151: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, Any, 1), Any, ToonHQ, Any, NA, DefaultDialog), - 2152: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, Any, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 2153: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 2, Any, 1), Any, ToonHQ, Any, NA, DefaultDialog), - 2154: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 2, Any, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 2155: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, 'm', 1), Any, ToonHQ, Any, NA, DefaultDialog), - 2156: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, 's', 1), Any, ToonHQ, Any, NA, DefaultDialog), - 2157: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, 'c', 1), Any, ToonHQ, Any, NA, DefaultDialog), - 2158: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, 'l', 1), Any, ToonHQ, Any, NA, DefaultDialog), + 2151: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, Any, 1, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 2152: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, Any, 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 2153: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 2, Any, 1, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 2154: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 2, Any, 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 2155: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, 'm', 1, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 2156: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, 's', 1, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 2157: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, 'c', 1, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 2158: (DD_TIER + 1, Start, (BuildingQuest, Anywhere, 1, 'l', 1, 0), Any, ToonHQ, Any, NA, DefaultDialog), 2159: (DD_TIER + 1, Start, (DeliverGagQuest, 2, ToontownBattleGlobals.THROW_TRACK, 1), Any, Any, Any, NA, DefaultDialog), 2160: (DD_TIER + 1, Start, (DeliverGagQuest, 1, ToontownBattleGlobals.SQUIRT_TRACK, 1), Any, Any, Any, NA, DefaultDialog), 2161: (DD_TIER + 1, Start, (DeliverGagQuest, 1, ToontownBattleGlobals.SQUIRT_TRACK, 2), Any, Any, Any, NA, DefaultDialog), @@ -2308,7 +2330,7 @@ QuestDict = { 2920: (DD_TIER + 2, Cont, (VisitQuest,), Same, 1204, NA, 2921, TTLocalizer.QuestDialog_2910), 2921: (DD_TIER + 2, Cont, (CogTrackQuest, ToontownGlobals.DonaldsDock, 6, 'c'), Same, Same, NA, 2925, TTLocalizer.QuestDialogDict[2921]), 2925: (DD_TIER + 2, Cont, (DeliverItemQuest, 2012), Same, 1203, NA, 2926, TTLocalizer.QuestDialogDict[2925]), - 2926: (DD_TIER + 2, Cont, (BuildingQuest, ToontownGlobals.DonaldsDock, 1, Any, 2), Same, Same, 900, NA, TTLocalizer.QuestDialogDict[2926]), + 2926: (DD_TIER + 2, Cont, (BuildingQuest, ToontownGlobals.DonaldsDock, 1, Any, 2, 0), Same, Same, 900, NA, TTLocalizer.QuestDialogDict[2926]), 3101: (DG_TIER, Start, (CogQuest, ToontownGlobals.DaisyGardens, 8, Any), Any, ToonHQ, Any, NA, DefaultDialog), 3102: (DG_TIER, Start, (CogQuest, ToontownGlobals.DaisyGardens, 10, Any), Any, ToonHQ, Any, NA, DefaultDialog), 3103: (DG_TIER, Start, (CogQuest, ToontownGlobals.DaisyGardens, 12, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -2359,14 +2381,14 @@ QuestDict = { 3148: (DG_TIER, Start, (CogTrackQuest, Anywhere, 14, 's'), Any, ToonHQ, Any, NA, DefaultDialog), 3149: (DG_TIER, Start, (CogTrackQuest, Anywhere, 14, 'c'), Any, ToonHQ, OBSOLETE, NA, DefaultDialog), 3150: (DG_TIER, Start, (CogTrackQuest, Anywhere, 14, 'l'), Any, ToonHQ, Any, NA, DefaultDialog), - 3151: (DG_TIER, Start, (BuildingQuest, Anywhere, 1, Any, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 3152: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, Any, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 3153: (DG_TIER, Start, (BuildingQuest, Anywhere, 3, Any, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 3154: (DG_TIER, Start, (BuildingQuest, Anywhere, 4, Any, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 3155: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, 'm', 2), Any, ToonHQ, OBSOLETE, NA, DefaultDialog), - 3156: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, 's', 2), Any, ToonHQ, Any, NA, DefaultDialog), - 3157: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, 'c', 2), Any, ToonHQ, OBSOLETE, NA, DefaultDialog), - 3158: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, 'l', 2), Any, ToonHQ, Any, NA, DefaultDialog), + 3151: (DG_TIER, Start, (BuildingQuest, Anywhere, 1, Any, 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 3152: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, Any, 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 3153: (DG_TIER, Start, (BuildingQuest, Anywhere, 3, Any, 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 3154: (DG_TIER, Start, (BuildingQuest, Anywhere, 4, Any, 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 3155: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, 'm', 2, 0), Any, ToonHQ, OBSOLETE, NA, DefaultDialog), + 3156: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, 's', 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 3157: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, 'c', 2, 0), Any, ToonHQ, OBSOLETE, NA, DefaultDialog), + 3158: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, 'l', 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), 3200: (DG_TIER, Start, (VisitQuest,), Any, 5101, NA, 3201, TTLocalizer.QuestDialogDict[3200]), 3201: (DG_TIER, Start, (DeliverItemQuest, 5001), 5101, 5206, NA, 3203, TTLocalizer.QuestDialogDict[3201]), 3203: (DG_TIER, Cont, (RecoverItemQuest, ToontownGlobals.DaisyGardens, 1, 5002, VeryHard, Any), Same, Same, 100, NA, TTLocalizer.QuestDialogDict[3203]), @@ -2392,9 +2414,9 @@ QuestDict = { 3246: (DG_TIER, Cont, (RecoverItemQuest, Anywhere, 1, 5010, VeryHard, 'sd'), Same, Same, 101, NA, TTLocalizer.QuestDialogDict[3246]), 3220: (DG_TIER, Start, (VisitQuest,), Any, 5207, NA, 3221, TTLocalizer.QuestDialogDict[3220]), 3221: (DG_TIER, Start, (CogQuest, ToontownGlobals.DaisyGardens, 20, Any), 5207, Same, 100, NA, TTLocalizer.QuestDialogDict[3221]), - 3222: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, Any, 1), ToonHQ, ToonHQ, NA, 3223, TTLocalizer.QuestDialogDict[3222]), - 3223: (DG_TIER, Cont, (BuildingQuest, Anywhere, 2, Any, 2), Same, Same, NA, 3224, TTLocalizer.QuestDialogDict[3223]), - 3224: (DG_TIER, Cont, (BuildingQuest, Anywhere, 2, Any, 3), Same, Same, 501, NA, TTLocalizer.QuestDialogDict[3224]), + 3222: (DG_TIER, Start, (BuildingQuest, Anywhere, 2, Any, 1, 0), ToonHQ, ToonHQ, NA, 3223, TTLocalizer.QuestDialogDict[3222]), + 3223: (DG_TIER, Cont, (BuildingQuest, Anywhere, 2, Any, 2, 0), Same, Same, NA, 3224, TTLocalizer.QuestDialogDict[3223]), + 3224: (DG_TIER, Cont, (BuildingQuest, Anywhere, 2, Any, 3, 0), Same, Same, 501, NA, TTLocalizer.QuestDialogDict[3224]), 3225: (DG_TIER, Start, (VisitQuest,), Any, 5108, NA, (3226, 3227, 3228, 3229, 3230, 3231, 3232, 3233, 3234), TTLocalizer.QuestDialogDict[3225]), 3226: (DG_TIER, Start, (DeliverItemQuest, 5011), 5108, 5201, NA, 3235, TTLocalizer.QuestDialog_3225), 3227: (DG_TIER, Start, (DeliverItemQuest, 5011), 5108, 5203, NA, 3235, TTLocalizer.QuestDialog_3225), @@ -2406,14 +2428,14 @@ QuestDict = { 3233: (DG_TIER, Start, (DeliverItemQuest, 5011), 5108, 5105, NA, 3235, TTLocalizer.QuestDialog_3225), 3234: (DG_TIER, Start, (DeliverItemQuest, 5011), 5108, 5207, NA, 3235, TTLocalizer.QuestDialog_3225), 3235: (DG_TIER, Cont, (CogQuest, ToontownGlobals.DaisyGardens, 10, Any), Same, 5108, 100, NA, TTLocalizer.QuestDialogDict[3235]), - 3236: (DG_TIER, OBSOLETE, (BuildingQuest, Anywhere, 3, 'l', 2), Any, ToonHQ, NA, 3237, TTLocalizer.QuestDialogDict[3236]), - 3237: (DG_TIER, OBSOLETE, (BuildingQuest, Anywhere, 3, 's', 2), Same, Same, 702, NA, TTLocalizer.QuestDialogDict[3237]), + 3236: (DG_TIER, OBSOLETE, (BuildingQuest, Anywhere, 3, 'l', 2, 0), Any, ToonHQ, NA, 3237, TTLocalizer.QuestDialogDict[3236]), + 3237: (DG_TIER, OBSOLETE, (BuildingQuest, Anywhere, 3, 's', 2, 0), Same, Same, 702, NA, TTLocalizer.QuestDialogDict[3237]), 3238: (DG_TIER, Start, (RecoverItemQuest, Anywhere, 1, 2, VeryEasy, 'm'), Any, ToonHQ, NA, 3239, TTLocalizer.QuestDialogDict[3238]), 3239: (DG_TIER, Cont, (RecoverItemQuest, Anywhere, 1, 5012, Hard, 'm'), Same, Same, 302, NA, TTLocalizer.QuestDialogDict[3239]), 3242: (DG_TIER, Start, (RecoverItemQuest, Anywhere, 1, 2, VeryEasy, 'le'), Any, ToonHQ, NA, 3243, TTLocalizer.QuestDialogDict[3242]), 3243: (DG_TIER, Cont, (RecoverItemQuest, Anywhere, 1, 5012, Hard, 'le'), Same, Same, 302, NA, TTLocalizer.QuestDialogDict[3243]), 3240: (DG_TIER, OBSOLETE, (RecoverItemQuest, Anywhere, 1, 5009, Hard, 'le'), Any, 5103, 102, NA, TTLocalizer.QuestDialogDict[3240]), - 3241: (DG_TIER, OBSOLETE, (BuildingQuest, Anywhere, 5, Any, 3), Any, ToonHQ, 102, NA, TTLocalizer.QuestDialogDict[3241]), + 3241: (DG_TIER, OBSOLETE, (BuildingQuest, Anywhere, 5, Any, 3, 0), Any, ToonHQ, 102, NA, TTLocalizer.QuestDialogDict[3241]), 3250: (DG_TIER, Start, (VisitQuest,), Any, 5317, NA, 3251, TTLocalizer.QuestDialogDict[3250]), 3251: (DG_TIER, Start, (CogTrackQuest, ToontownGlobals.SellbotHQ, 5, 's'), 5317, Same, NA, 3252, TTLocalizer.QuestDialogDict[3251]), 3252: (DG_TIER, Cont, (VisitQuest,), Same, 5311, NA, 3253, TTLocalizer.QuestDialogDict[3252]), @@ -2507,14 +2529,14 @@ QuestDict = { 4148: (MM_TIER + 1, Start, (CogTrackQuest, Anywhere, 30, 's'), Any, ToonHQ, Any, NA, DefaultDialog), 4149: (MM_TIER + 1, Start, (CogTrackQuest, Anywhere, 30, 'c'), Any, ToonHQ, Any, NA, DefaultDialog), 4150: (MM_TIER + 1, Start, (CogTrackQuest, Anywhere, 30, 'l'), Any, ToonHQ, Any, NA, DefaultDialog), - 4151: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 1, Any, 3), Any, ToonHQ, Any, NA, DefaultDialog), - 4152: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 2, Any, 3), Any, ToonHQ, Any, NA, DefaultDialog), - 4153: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, Any, 3), Any, ToonHQ, Any, NA, DefaultDialog), - 4154: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 4, Any, 3), Any, ToonHQ, Any, NA, DefaultDialog), - 4155: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 'm', 3), Any, ToonHQ, Any, NA, DefaultDialog), - 4156: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 's', 3), Any, ToonHQ, Any, NA, DefaultDialog), - 4157: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 'c', 3), Any, ToonHQ, Any, NA, DefaultDialog), - 4158: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 'l', 3), Any, ToonHQ, Any, NA, DefaultDialog), + 4151: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 1, Any, 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 4152: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 2, Any, 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 4153: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, Any, 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 4154: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 4, Any, 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 4155: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 'm', 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 4156: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 's', 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 4157: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 'c', 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 4158: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 'l', 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), 4160: (MM_TIER + 1, Start, (CogQuest, ToontownGlobals.SellbotHQ, 10, Any), Any, ToonHQ, Any, NA, DefaultDialog), 4161: (MM_TIER + 1, Start, (CogQuest, ToontownGlobals.SellbotHQ, 12, Any), Any, ToonHQ, Any, NA, DefaultDialog), 4162: (MM_TIER + 1, Start, (CogLevelQuest, ToontownGlobals.SellbotHQ, 6, 4), Any, ToonHQ, Any, NA, DefaultDialog), @@ -2522,6 +2544,12 @@ QuestDict = { 4164: (MM_TIER + 1, Start, (FactoryQuest, ToontownGlobals.SellbotHQ, 1), Any, ToonHQ, Any, NA, DefaultDialog), 4165: (MM_TIER + 1, Start, (SkelecogQuest, ToontownGlobals.SellbotFactoryInt, 4), Any, ToonHQ, Any, NA, DefaultDialog), 4166: (MM_TIER + 1, Start, (ForemanQuest, ToontownGlobals.SellbotHQ, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 4167: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 1, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 4168: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 2, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 4169: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 4170: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 4, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 4171: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 's', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 4172: (MM_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 'l', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), 4200: (MM_TIER + 1, Start, (VisitQuest,), Any, 4101, NA, 4201, TTLocalizer.QuestDialogDict[4200]), 4201: (MM_TIER + 1, Start, (VisitQuest,), 4101, 4201, NA, 4202, TTLocalizer.QuestDialogDict[4201]), 4202: (MM_TIER + 1, Cont, (DeliverItemQuest, 4001), Same, 4101, NA, 4203, TTLocalizer.QuestDialogDict[4202]), @@ -2536,7 +2564,7 @@ QuestDict = { 4211: (MM_TIER + 1, Start, (VisitQuest,), ToonHQ, 4103, NA, 4212, TTLocalizer.QuestDialogDict[4211]), 4212: (MM_TIER + 1, Start, (CogQuest, ToontownGlobals.MinniesMelodyland, 10, 'nc'), 4103, Same, NA, 4213, TTLocalizer.QuestDialogDict[4212]), 4213: (MM_TIER + 1, Cont, (CogTrackQuest, ToontownGlobals.MinniesMelodyland, 20, 'm'), Same, Same, NA, 4214, TTLocalizer.QuestDialogDict[4213]), - 4214: (MM_TIER + 1, Cont, (BuildingQuest, Anywhere, 1, 'm', Any), Same, Same, 303, NA, TTLocalizer.QuestDialogDict[4214]), + 4214: (MM_TIER + 1, Cont, (BuildingQuest, Anywhere, 1, 'm', Any, 0), Same, Same, 303, NA, TTLocalizer.QuestDialogDict[4214]), 4215: (MM_TIER + 1, Start, (VisitQuest,), Any, 4302, NA, 4216, TTLocalizer.QuestDialogDict[4215]), 4216: (MM_TIER + 1, Start, (RecoverItemQuest, Anywhere, 1, 4005, VeryHard, 'gh'), 4302, Same, NA, 4217, TTLocalizer.QuestDialogDict[4216]), 4217: (MM_TIER + 1, Cont, (DeliverItemQuest, 4005), Same, 4203, NA, 4218, TTLocalizer.QuestDialogDict[4217]), @@ -2552,11 +2580,11 @@ QuestDict = { 902: (MM_TIER + 2, Start, (VisitQuest,), Any, 4303, NA, 4903, TTLocalizer.QuestDialogDict[902]), 4903: (MM_TIER + 2, Start, (DeliverItemQuest, 4008), 4303, 4109, NA, 4904, TTLocalizer.QuestDialogDict[4903]), 4904: (MM_TIER + 2, Cont, (RecoverItemQuest, Anywhere, 1, 4009, VeryHard, AnyFish), Same, Same, NA, 4905, TTLocalizer.QuestDialogDict[4904]), - 4905: (MM_TIER + 2, Cont, (BuildingQuest, Anywhere, 1, Any, 1), Same, Same, NA, 4906, TTLocalizer.QuestDialogDict[4905]), + 4905: (MM_TIER + 2, Cont, (BuildingQuest, Anywhere, 1, Any, 1, 0), Same, Same, NA, 4906, TTLocalizer.QuestDialogDict[4905]), 4906: (MM_TIER + 2, Cont, (DeliverItemQuest, 4010), Same, 4303, NA, 4907, TTLocalizer.QuestDialogDict[4906]), 4907: (MM_TIER + 2, Cont, (VisitQuest,), Same, 4208, NA, 4908, TTLocalizer.QuestDialogDict[4907]), - 4908: (MM_TIER + 2, Cont, (BuildingQuest, Anywhere, 1, Any, 2), Same, Same, NA, 4909, TTLocalizer.QuestDialogDict[4908]), - 4909: (MM_TIER + 2, Cont, (BuildingQuest, Anywhere, 1, Any, 3), Same, Same, NA, 4910, TTLocalizer.QuestDialogDict[4909]), + 4908: (MM_TIER + 2, Cont, (BuildingQuest, Anywhere, 1, Any, 2, 0), Same, Same, NA, 4909, TTLocalizer.QuestDialogDict[4908]), + 4909: (MM_TIER + 2, Cont, (BuildingQuest, Anywhere, 1, Any, 3, 0), Same, Same, NA, 4910, TTLocalizer.QuestDialogDict[4909]), 4910: (MM_TIER + 2, Cont, (DeliverItemQuest, 4011), Same, 4303, 900, NA, TTLocalizer.QuestDialogDict[4910]), 4810: (MM_TIER + 2, Start, (CogQuest, Anywhere, 16, Any), Any, ToonHQ, Any, NA, DefaultDialog), 4811: (MM_TIER + 2, Start, (CogQuest, Anywhere, 18, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -2592,10 +2620,10 @@ QuestDict = { 5247: (BR_TIER, Start, (VisitQuest,), Any, 3112, NA, 5248, TTLocalizer.QuestDialogDict[5247]), 5248: (BR_TIER, Start, (CogLevelQuest, Anywhere, 10, 8), 3112, Same, NA, 5249, TTLocalizer.QuestDialogDict[5248]), 5249: (BR_TIER, Cont, (RecoverItemQuest, Anywhere, 3, 3018, VeryHard, AnyFish), Same, Same, NA, (5250, 5258, 5259, 5260), TTLocalizer.QuestDialogDict[5249]), - 5250: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'l', 4), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5250]), - 5258: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'c', 4), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5258]), - 5259: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'm', 4), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5259]), - 5260: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 's', 4), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5260]), + 5250: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'l', 4, 0), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5250]), + 5258: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'c', 4, 0), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5258]), + 5259: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'm', 4, 0), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5259]), + 5260: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 's', 4, 0), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5260]), 5020: (BR_TIER, Start, (CogQuest, Anywhere, 36, Any), Any, ToonHQ, Any, NA, DefaultDialog), 5021: (BR_TIER, Start, (CogQuest, Anywhere, 38, Any), Any, ToonHQ, Any, NA, DefaultDialog), 5022: (BR_TIER, Start, (CogQuest, Anywhere, 40, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -2622,10 +2650,10 @@ QuestDict = { 5061: (BR_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 5, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog), 5062: (BR_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 5, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog), 5063: (BR_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 5, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog), - 5064: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), - 5065: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), - 5066: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), - 5067: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5064: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5065: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5066: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5067: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), 5070: (BR_TIER, Start, (CogQuest, ToontownGlobals.SellbotHQ, 20, Any), Any, ToonHQ, Any, NA, DefaultDialog), 5071: (BR_TIER, Start, (CogQuest, ToontownGlobals.SellbotHQ, 22, Any), Any, ToonHQ, Any, NA, DefaultDialog), 5072: (BR_TIER, Start, (CogLevelQuest, ToontownGlobals.SellbotHQ, 15, 4), Any, ToonHQ, Any, NA, DefaultDialog), @@ -2691,14 +2719,14 @@ QuestDict = { 5148: (BR_TIER + 1, Start, (CogTrackQuest, Anywhere, 45, 's'), Any, ToonHQ, Any, NA, DefaultDialog), 5149: (BR_TIER + 1, Start, (CogTrackQuest, Anywhere, 45, 'c'), Any, ToonHQ, Any, NA, DefaultDialog), 5150: (BR_TIER + 1, Start, (CogTrackQuest, Anywhere, 45, 'l'), Any, ToonHQ, Any, NA, DefaultDialog), - 5151: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 8, Any, 3), Any, ToonHQ, Any, NA, DefaultDialog), - 5152: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 2, Any, 4), Any, ToonHQ, Any, NA, DefaultDialog), - 5153: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 5, Any, 4), Any, ToonHQ, Any, NA, DefaultDialog), - 5154: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 6, Any, 4), Any, ToonHQ, Any, NA, DefaultDialog), - 5155: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 2, 'm', 4), Any, ToonHQ, Any, NA, DefaultDialog), - 5156: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 2, 's', 4), Any, ToonHQ, Any, NA, DefaultDialog), - 5157: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 2, 'c', 4), Any, ToonHQ, Any, NA, DefaultDialog), - 5158: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 2, 'l', 4), Any, ToonHQ, Any, NA, DefaultDialog), + 5151: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 8, Any, 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 5152: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 2, Any, 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 5153: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 5, Any, 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 5154: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 6, Any, 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 5155: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 2, 'm', 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 5156: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 2, 's', 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 5157: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 2, 'c', 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 5158: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 2, 'l', 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), 5160: (BR_TIER + 1, Start, (CogQuest, ToontownGlobals.SellbotHQ, 22, Any), Any, ToonHQ, Any, NA, DefaultDialog), 5161: (BR_TIER + 1, Start, (CogQuest, ToontownGlobals.SellbotHQ, 25, Any), Any, ToonHQ, Any, NA, DefaultDialog), 5162: (BR_TIER + 1, Start, (CogLevelQuest, ToontownGlobals.SellbotHQ, 16, 4), Any, ToonHQ, Any, NA, DefaultDialog), @@ -2714,6 +2742,11 @@ QuestDict = { 5172: (BR_TIER + 1, Start, (SkelecogLevelQuest, ToontownGlobals.SellbotHQ, 3, 6), Any, ToonHQ, Any, NA, DefaultDialog), 5173: (BR_TIER + 1, Start, (ForemanQuest, ToontownGlobals.SellbotHQ, 1), Any, ToonHQ, Any, NA, DefaultDialog), 5174: (BR_TIER + 1, Start, (ForemanQuest, ToontownGlobals.SellbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), + 5176: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 4, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 5177: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 5, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 5178: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 6, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 5179: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 's', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 5180: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 'l', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), 5200: (BR_TIER + 1, Start, (VisitQuest,), Any, 3110, NA, (5201, 5261, 5262, 5263), TTLocalizer.QuestDialogDict[5200]), 5201: (BR_TIER + 1, Start, (RecoverItemQuest, Anywhere, 1, 3001, VeryHard, 'hh'), 3110, Same, 100, NA, TTLocalizer.QuestDialogDict[5201]), 5261: (BR_TIER + 1, Start, (RecoverItemQuest, Anywhere, 1, 3001, VeryHard, 'tf'), 3110, Same, 100, NA, TTLocalizer.QuestDialogDict[5261]), @@ -2724,7 +2757,7 @@ QuestDict = { 5204: (BR_TIER + 1, Cont, (VisitQuest,), Same, 3205, NA, 5205, TTLocalizer.QuestDialogDict[5204]), 5205: (BR_TIER + 1, Cont, (RecoverItemQuest, ToontownGlobals.TheBrrrgh, 3, 3003, Hard, AnyFish), Same, Same, NA, 5206, TTLocalizer.QuestDialogDict[5205]), 5206: (BR_TIER + 1, Cont, (VisitQuest,), Same, 3210, NA, 5207, TTLocalizer.QuestDialogDict[5206]), - 5207: (BR_TIER + 1, Cont, (BuildingQuest, Anywhere, 5, Any, 4), Same, Same, NA, 5208, TTLocalizer.QuestDialogDict[5207]), + 5207: (BR_TIER + 1, Cont, (BuildingQuest, Anywhere, 5, Any, 4, 0), Same, Same, NA, 5208, TTLocalizer.QuestDialogDict[5207]), 5208: (BR_TIER + 1, Cont, (VisitQuest,), Same, 3114, NA, 5209, TTLocalizer.QuestDialogDict[5208]), 5209: (BR_TIER + 1, Cont, (CogLevelQuest, Anywhere, 20, 7), Same, Same, 204, NA, TTLocalizer.QuestDialogDict[5209]), 5210: (BR_TIER + 1, Start, (VisitQuest,), Any, 3206, NA, (5211, 5264, 5265, 5266), TTLocalizer.QuestDialogDict[5210]), @@ -2746,7 +2779,7 @@ QuestDict = { 5223: (BR_TIER + 1, Cont, (DeliverItemQuest, 3008), Same, 3113, NA, 5224, TTLocalizer.QuestDialogDict[5223]), 5224: (BR_TIER + 1, Cont, (CogQuest, Anywhere, 5, 'le'), Same, Same, 502, NA, TTLocalizer.QuestDialogDict[5224]), 5225: (BR_TIER + 1, Start, (VisitQuest,), Any, 3106, NA, 5226, TTLocalizer.QuestDialogDict[5225]), - 5226: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 'm', 4), 3106, Same, NA, 5227, TTLocalizer.QuestDialogDict[5226]), + 5226: (BR_TIER + 1, Start, (BuildingQuest, Anywhere, 3, 'm', 4, 0), 3106, Same, NA, 5227, TTLocalizer.QuestDialogDict[5226]), 5227: (BR_TIER + 1, Cont, (VisitQuest,), Same, 3208, NA, 5228, TTLocalizer.QuestDialogDict[5227]), 5228: (BR_TIER + 1, Cont, (DeliverItemQuest, 3009), Same, 3207, NA, (5229, 5267, 5268, 5269), TTLocalizer.QuestDialogDict[5228]), 5229: (BR_TIER + 1, Cont, (CogTrackQuest, ToontownGlobals.TheBrrrgh, 8, 'm'), Same, Same, NA, 5230, TTLocalizer.QuestDialogDict[5229]), @@ -2763,7 +2796,7 @@ QuestDict = { 5243: (BR_TIER + 1, Start, (VisitQuest,), Any, 3217, NA, 5244, TTLocalizer.QuestDialogDict[5243]), 5244: (BR_TIER + 1, Start, (RecoverItemQuest, Anywhere, 1, 2007, VeryHard, 'mm'), 3217, Same, NA, 5245, TTLocalizer.QuestDialogDict[5244]), 5245: (BR_TIER + 1, Cont, (RecoverItemQuest, Anywhere, 1, 3017, Hard, AnyFish), Same, Same, NA, 5246, TTLocalizer.QuestDialogDict[5245]), - 5246: (BR_TIER + 1, Cont, (BuildingQuest, ToontownGlobals.TheBrrrgh, 5, Any, 1), Same, Same, 101, NA, TTLocalizer.QuestDialogDict[5246]), + 5246: (BR_TIER + 1, Cont, (BuildingQuest, ToontownGlobals.TheBrrrgh, 5, Any, 1, 0), Same, Same, 101, NA, TTLocalizer.QuestDialogDict[5246]), 5251: (BR_TIER + 1, Start, (VisitQuest,), Any, 3134, NA, 5252, TTLocalizer.QuestDialogDict[5251]), 5252: (BR_TIER + 1, Start, (RecoverItemQuest, Anywhere, 1, 3019, VeryHard, Any), 3134, Same, NA, (5253, 5273, 5274, 5275), TTLocalizer.QuestDialogDict[5252]), 5253: (BR_TIER + 1, Cont, (RecoverItemQuest, Anywhere, 1, 3020, VeryHard, 'cr'), Same, Same, NA, (5254, 5282, 5283, 5284), TTLocalizer.QuestDialogDict[5253]), @@ -2785,7 +2818,7 @@ QuestDict = { 5304: (BR_TIER + 1, Cont, (RecoverItemQuest, ToontownGlobals.TheBrrrgh, 1, 3024, VeryHard, 'l', 'track'), Same, Same, NA, 5305, TTLocalizer.QuestDialogDict[5304]), 5305: (BR_TIER + 1, Cont, (CogLevelQuest, Anywhere, 20, 7), Same, Same, NA, 5306, TTLocalizer.QuestDialogDict[5305]), 5306: (BR_TIER + 1, Cont, (RecoverItemQuest, ToontownGlobals.TheBrrrgh, 2, 3025, Hard, AnyFish), Same, Same, NA, 5307, TTLocalizer.QuestDialogDict[5306]), - 5307: (BR_TIER + 1, Cont, (BuildingQuest, Anywhere, 5, Any, 4), Same, Same, 204, NA, TTLocalizer.QuestDialogDict[5307]), + 5307: (BR_TIER + 1, Cont, (BuildingQuest, Anywhere, 5, Any, 4, 0), Same, Same, 204, NA, TTLocalizer.QuestDialogDict[5307]), 5308: (BR_TIER + 1, Start, (VisitQuest,), Any, 3312, NA, 5309, TTLocalizer.QuestDialogDict[5308]), 5309: (BR_TIER + 1, Start, (CogTrackQuest, ToontownGlobals.PolarPlace, 30, 'l'), Same, Same, NA, 5310, TTLocalizer.QuestDialogDict[5309]), 5310: (BR_TIER + 1, Cont, (VisitQuest,), Same, 3113, NA, 5311, TTLocalizer.QuestDialogDict[5310]), @@ -2795,10 +2828,10 @@ QuestDict = { 5291: (BR_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 12, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog), 5292: (BR_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 12, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog), 5293: (BR_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 12, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog), - 5294: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), - 5295: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), - 5296: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), - 5297: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5294: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5295: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5296: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5297: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), 5500: (BR_TIER + 1, Start, (CogQuest, ToontownGlobals.TheBrrrgh, 75, Any), Any, ToonHQ, NA, 5501, DefaultDialog), 5501: (BR_TIER + 1, Cont, (DeliverItemQuest, 1000), Any, 3008, 1000, NA, DefaultDialog), 903: (BR_TIER + 2, Start, (VisitQuest,), Any, 3112, NA, (5234, 5278), TTLocalizer.QuestDialogDict[903]), @@ -2813,7 +2846,7 @@ QuestDict = { 5239: (BR_TIER + 2, Cont, (DeliverItemQuest, 3015), Same, 3112, NA, (5240, 5281), TTLocalizer.QuestDialogDict[5239]), 5240: (BR_TIER + 2, Cont, (RecoverItemQuest, Anywhere, 1, 3016, Hard, 'bw'), Same, Same, NA, 5241, TTLocalizer.QuestDialogDict[5240]), 5281: (BR_TIER + 2, Cont, (RecoverItemQuest, Anywhere, 1, 3023, Hard, 'mh'), Same, Same, NA, 5241, TTLocalizer.QuestDialogDict[5281]), - 5241: (BR_TIER + 2, Cont, (BuildingQuest, Anywhere, 20, Any, 4), Same, Same, NA, 5242, TTLocalizer.QuestDialogDict[5241]), + 5241: (BR_TIER + 2, Cont, (BuildingQuest, Anywhere, 20, Any, 4, 0), Same, Same, NA, 5242, TTLocalizer.QuestDialogDict[5241]), 5242: (BR_TIER + 2, Cont, (RecoverItemQuest, Anywhere, 1, 3014, VeryHard, AnyFish), Same, Same, 900, NA, TTLocalizer.QuestDialogDict[5242]), 5320: (BR_TIER + 2, Start, (CogQuest, Anywhere, 36, Any), Any, ToonHQ, Any, NA, DefaultDialog), 5321: (BR_TIER + 2, Start, (CogQuest, Anywhere, 38, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -2841,10 +2874,10 @@ QuestDict = { 5361: (BR_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 20, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog), 5362: (BR_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 20, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog), 5363: (BR_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 20, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog), - 5364: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), - 5365: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), - 5366: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), - 5367: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5364: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5365: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5366: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), + 5367: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), 5370: (BR_TIER + 2, Start, (CogQuest, ToontownGlobals.SellbotHQ, 22, Any), Any, ToonHQ, Any, NA, DefaultDialog), 5371: (BR_TIER + 2, Start, (CogQuest, ToontownGlobals.SellbotHQ, 25, Any), Any, ToonHQ, Any, NA, DefaultDialog), 5372: (BR_TIER + 2, Start, (CogLevelQuest, ToontownGlobals.SellbotHQ, 16, 4), Any, ToonHQ, Any, NA, DefaultDialog), @@ -2910,22 +2943,22 @@ QuestDict = { 6148: (DL_TIER, Start, (CogTrackQuest, Anywhere, 70, 's'), Any, ToonHQ, Any, NA, DefaultDialog), 6149: (DL_TIER, Start, (CogTrackQuest, Anywhere, 70, 'c'), Any, ToonHQ, Any, NA, DefaultDialog), 6150: (DL_TIER, Start, (CogTrackQuest, Anywhere, 70, 'l'), Any, ToonHQ, Any, NA, DefaultDialog), - 6151: (DL_TIER, Start, (BuildingQuest, Anywhere, 10, Any, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 6152: (DL_TIER, Start, (BuildingQuest, Anywhere, 6, Any, 4), Any, ToonHQ, Any, NA, DefaultDialog), - 6153: (DL_TIER, OBSOLETE, (BuildingQuest, Anywhere, 8, Any, 4), Any, ToonHQ, Any, NA, DefaultDialog), - 6154: (DL_TIER, Start, (BuildingQuest, Anywhere, 6, Any, 5), Any, ToonHQ, Any, NA, DefaultDialog), - 6155: (DL_TIER, Start, (BuildingQuest, Anywhere, 2, 'm', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 6156: (DL_TIER, Start, (BuildingQuest, Anywhere, 2, 's', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 6157: (DL_TIER, Start, (BuildingQuest, Anywhere, 2, 'c', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 6158: (DL_TIER, Start, (BuildingQuest, Anywhere, 2, 'l', 5), Any, ToonHQ, Any, NA, DefaultDialog), + 6151: (DL_TIER, Start, (BuildingQuest, Anywhere, 10, Any, 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 6152: (DL_TIER, Start, (BuildingQuest, Anywhere, 6, Any, 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 6153: (DL_TIER, OBSOLETE, (BuildingQuest, Anywhere, 8, Any, 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 6154: (DL_TIER, Start, (BuildingQuest, Anywhere, 6, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 6155: (DL_TIER, Start, (BuildingQuest, Anywhere, 2, 'm', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 6156: (DL_TIER, Start, (BuildingQuest, Anywhere, 2, 's', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 6157: (DL_TIER, Start, (BuildingQuest, Anywhere, 2, 'c', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 6158: (DL_TIER, Start, (BuildingQuest, Anywhere, 2, 'l', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), 6160: (DL_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 25, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), 6161: (DL_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 25, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), 6162: (DL_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 25, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), 6163: (DL_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 25, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), - 6164: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), - 6165: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), - 6166: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), - 6167: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), + 6164: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), + 6165: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), + 6166: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), + 6167: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), 6170: (DL_TIER, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 40, Any), Any, ToonHQ, Any, NA, DefaultDialog), 6171: (DL_TIER, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 45, Any), Any, ToonHQ, Any, NA, DefaultDialog), 6172: (DL_TIER, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 50, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -2951,10 +2984,14 @@ QuestDict = { 6194: (DL_TIER, Start, (FactoryNewbieQuest, ToontownGlobals.SellbotHQ, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), 6195: (DL_TIER, Start, (FactoryNewbieQuest, ToontownGlobals.SellbotHQ, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), 6196: (DL_TIER, Start, (ForemanNewbieQuest, ToontownGlobals.SellbotFactoryInt, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), + 6197: (DL_TIER, Start, (BuildingQuest, Anywhere, 10, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 6198: (DL_TIER, Start, (BuildingQuest, Anywhere, 8, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 6199: (DL_TIER, Start, (BuildingQuest, Anywhere, 6, 's', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 6200: (DL_TIER, Start, (BuildingQuest, Anywhere, 5, 'l', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), 6201: (DL_TIER, Start, (VisitQuest,), Any, 9111, NA, 6202, TTLocalizer.QuestDialogDict[6201]), 6202: (DL_TIER, Start, (CogQuest, ToontownGlobals.DonaldsDreamland, 70, Any), 9111, Same, 100, NA, TTLocalizer.QuestDialogDict[6202]), 6206: (DL_TIER, Start, (VisitQuest,), Any, 9131, NA, 6207, TTLocalizer.QuestDialogDict[6206]), - 6207: (DL_TIER, Start, (BuildingQuest, ToontownGlobals.DonaldsDreamland, 8, Any, 4), 9131, Same, 205, NA, TTLocalizer.QuestDialogDict[6207]), + 6207: (DL_TIER, Start, (BuildingQuest, ToontownGlobals.DonaldsDreamland, 8, Any, 4, 0), 9131, Same, 205, NA, TTLocalizer.QuestDialogDict[6207]), 6211: (DL_TIER, Start, (VisitQuest,), Any, 9217, NA, 6212, TTLocalizer.QuestDialogDict[6211]), 6212: (DL_TIER, Start, (RecoverItemQuest, Anywhere, 3, 6002, Medium, 'bc'), 9217, Same, NA, 6213, TTLocalizer.QuestDialogDict[6212]), 6213: (DL_TIER, Cont, (RecoverItemQuest, Anywhere, 1, 6003, Hard, 'mb'), Same, Same, NA, 6214, TTLocalizer.QuestDialogDict[6213]), @@ -2985,7 +3022,7 @@ QuestDict = { 6265: (DL_TIER, Cont, (DeliverItemQuest, 6012), Same, 9115, NA, 6266, TTLocalizer.QuestDialogDict[6265]), 6266: (DL_TIER, Cont, (VisitQuest,), Same, 9221, 103, NA, TTLocalizer.QuestDialogDict[6266]), 6271: (DL_TIER, Start, (VisitQuest,), Any, 9208, NA, 6272, TTLocalizer.QuestDialogDict[6271]), - 6272: (DL_TIER, Start, (BuildingQuest, ToontownGlobals.DonaldsDreamland, 2, 'm', 5), 9208, Same, 305, NA, TTLocalizer.QuestDialogDict[6272]), + 6272: (DL_TIER, Start, (BuildingQuest, ToontownGlobals.DonaldsDreamland, 2, 'm', 5, 0), 9208, Same, 305, NA, TTLocalizer.QuestDialogDict[6272]), 6281: (DL_TIER, Start, (VisitQuest,), Any, 9123, NA, 6282, TTLocalizer.QuestDialogDict[6281]), 6282: (DL_TIER, Start, (CogTrackQuest, ToontownGlobals.DonaldsDreamland, 55, 'm'), 9123, Same, 4001, NA, TTLocalizer.QuestDialogDict[6282]), 6291: (DL_TIER, Start, (VisitQuest,), Any, 9226, NA, 6292, TTLocalizer.QuestDialogDict[6291]), @@ -3064,22 +3101,22 @@ QuestDict = { 7148: (DL_TIER + 1, Start, (CogTrackQuest, Anywhere, 140, 's'), Any, ToonHQ, Any, NA, DefaultDialog), 7149: (DL_TIER + 1, Start, (CogTrackQuest, Anywhere, 140, 'c'), Any, ToonHQ, Any, NA, DefaultDialog), 7150: (DL_TIER + 1, Start, (CogTrackQuest, Anywhere, 140, 'l'), Any, ToonHQ, Any, NA, DefaultDialog), - 7151: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 20, Any, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 7152: (DL_TIER + 1, OBSOLETE, (BuildingQuest, Anywhere, 10, Any, 3), Any, ToonHQ, Any, NA, DefaultDialog), - 7153: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 10, Any, 4), Any, ToonHQ, Any, NA, DefaultDialog), - 7154: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 10, Any, 5), Any, ToonHQ, Any, NA, DefaultDialog), - 7155: (DL_TIER + 1, OBSOLETE, (BuildingQuest, Anywhere, 5, 'm', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 7156: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 5, 's', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 7157: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 5, 'c', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 7158: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 5, 'l', 5), Any, ToonHQ, Any, NA, DefaultDialog), + 7151: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 20, Any, 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 7152: (DL_TIER + 1, OBSOLETE, (BuildingQuest, Anywhere, 10, Any, 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 7153: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 10, Any, 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 7154: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 10, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 7155: (DL_TIER + 1, OBSOLETE, (BuildingQuest, Anywhere, 5, 'm', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 7156: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 5, 's', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 7157: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 5, 'c', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 7158: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 5, 'l', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), 7160: (DL_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 35, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), 7161: (DL_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 35, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), 7162: (DL_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 35, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), 7163: (DL_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 35, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog), - 7164: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), - 7165: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), - 7166: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), - 7167: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), + 7164: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), + 7165: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), + 7166: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), + 7167: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), 7170: (DL_TIER + 1, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 80, Any), Any, ToonHQ, Any, NA, DefaultDialog), 7171: (DL_TIER + 1, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 90, Any), Any, ToonHQ, Any, NA, DefaultDialog), 7172: (DL_TIER + 1, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 100, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -3122,7 +3159,7 @@ QuestDict = { 7219: (DL_TIER + 1, Start, (VisitQuest,), 9109, 9230, NA, 7220, TTLocalizer.QuestDialogDict[7219]), 7220: (DL_TIER + 1, Cont, (DeliverItemQuest, 7005), Same, 9109, NA, 7221, TTLocalizer.QuestDialogDict[7220]), 7221: (DL_TIER + 1, Cont, (VisitQuest,), Same, 9230, NA, 7222, TTLocalizer.QuestDialogDict[7221]), - 7222: (DL_TIER + 1, Cont, (BuildingQuest, Anywhere, 10, Any, 3), Same, Same, NA, 7223, TTLocalizer.QuestDialogDict[7222]), + 7222: (DL_TIER + 1, Cont, (BuildingQuest, Anywhere, 10, Any, 3, 0), Same, Same, NA, 7223, TTLocalizer.QuestDialogDict[7222]), 7223: (DL_TIER + 1, Cont, (DeliverItemQuest, 7006), Same, 9109, 4005, NA, TTLocalizer.QuestDialogDict[7223]), 7226: (DL_TIER + 1, Start, (VisitQuest,), Any, 9224, NA, 7227, TTLocalizer.QuestDialogDict[7226]), 7227: (DL_TIER + 1, Start, (VisitQuest,), 9224, 9102, NA, 7228, TTLocalizer.QuestDialogDict[7227]), @@ -3133,7 +3170,7 @@ QuestDict = { 7232: (DL_TIER + 1, Cont, (VisitQuest,), Same, 9216, NA, 7233, TTLocalizer.QuestDialogDict[7232]), 7233: (DL_TIER + 1, Cont, (DeliverItemQuest, 7009), Same, 9224, NA, 7234, TTLocalizer.QuestDialogDict[7233]), 7234: (DL_TIER + 1, Cont, (VisitQuest,), Same, 9216, NA, 7235, TTLocalizer.QuestDialogDict[7234]), - 7235: (DL_TIER + 1, Cont, (BuildingQuest, Anywhere, 5, 'm', 5), Same, Same, NA, 7236, TTLocalizer.QuestDialogDict[7235]), + 7235: (DL_TIER + 1, Cont, (BuildingQuest, Anywhere, 5, 'm', 5, 0), Same, Same, NA, 7236, TTLocalizer.QuestDialogDict[7235]), 7236: (DL_TIER + 1, Cont, (DeliverItemQuest, 7010), Same, 9224, 4006, NA, TTLocalizer.QuestDialogDict[7236]), 7239: (DL_TIER + 1, Start, (VisitQuest,), Any, 9114, NA, 7240, TTLocalizer.QuestDialogDict[7239]), 7240: (DL_TIER + 1, Start, (VisitQuest,), 9114, 9215, NA, 7241, TTLocalizer.QuestDialogDict[7240]), @@ -3164,6 +3201,10 @@ QuestDict = { 7270: (DL_TIER + 1, Start, (SupervisorQuest, ToontownGlobals.CashbotMintIntB, 6), Any, ToonHQ, Any, NA, DefaultDialog), 7500: (DL_TIER + 1, Start, (CogQuest, ToontownGlobals.DonaldsDreamland, 100, Any), Any, ToonHQ, NA, 7501, DefaultDialog), 7501: (DL_TIER + 1, Cont, (DeliverItemQuest, 1000), Any, 9010, 1000, NA, DefaultDialog), + 7502: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 20, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 7503: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 15, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 7504: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 10, 's', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 7505: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 10, 'l', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), 8101: (DL_TIER + 2, Start, (CogQuest, Anywhere, 240, Any), Any, ToonHQ, Any, NA, DefaultDialog), 8102: (DL_TIER + 2, Start, (CogQuest, Anywhere, 260, Any), Any, ToonHQ, Any, NA, DefaultDialog), 8103: (DL_TIER + 2, Start, (CogQuest, Anywhere, 280, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -3214,22 +3255,22 @@ QuestDict = { 8148: (DL_TIER + 2, Start, (CogTrackQuest, Anywhere, 300, 's'), Any, ToonHQ, Any, NA, DefaultDialog), 8149: (DL_TIER + 2, Start, (CogTrackQuest, Anywhere, 300, 'c'), Any, ToonHQ, Any, NA, DefaultDialog), 8150: (DL_TIER + 2, Start, (CogTrackQuest, Anywhere, 300, 'l'), Any, ToonHQ, Any, NA, DefaultDialog), - 8151: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 40, Any, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 8152: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 20, Any, 3), Any, ToonHQ, Any, NA, DefaultDialog), - 8153: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 20, Any, 4), Any, ToonHQ, Any, NA, DefaultDialog), - 8154: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 20, Any, 5), Any, ToonHQ, Any, NA, DefaultDialog), - 8155: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 10, 'm', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 8156: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 10, 's', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 8157: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 10, 'c', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 8158: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 10, 'l', 5), Any, ToonHQ, Any, NA, DefaultDialog), + 8151: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 40, Any, 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 8152: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 20, Any, 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 8153: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 20, Any, 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 8154: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 20, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 8155: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 10, 'm', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 8156: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 10, 's', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 8157: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 10, 'c', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 8158: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 10, 'l', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), 8160: (DL_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 40, Any, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), 8161: (DL_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 40, Any, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), 8162: (DL_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 40, Any, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), 8163: (DL_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 40, Any, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog), - 8164: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), - 8165: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), - 8166: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), - 8167: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), + 8164: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), + 8165: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), + 8166: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), + 8167: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), 8170: (DL_TIER + 2, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 160, Any), Any, ToonHQ, Any, NA, DefaultDialog), 8171: (DL_TIER + 2, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 180, Any), Any, ToonHQ, Any, NA, DefaultDialog), 8172: (DL_TIER + 2, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 200, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -3278,6 +3319,10 @@ QuestDict = { 8217: (DL_TIER + 2, Start, (SupervisorQuest, ToontownGlobals.CashbotMintIntB, 14), Any, ToonHQ, Any, NA, DefaultDialog), 8218: (DL_TIER + 2, Start, (SupervisorQuest, ToontownGlobals.CashbotMintIntC, 12), Any, ToonHQ, Any, NA, DefaultDialog), 8219: (DL_TIER + 2, Start, (CFOQuest, ToontownGlobals.CashbotHQ, 2), Any, ToonHQ, 621, NA, DefaultDialog), + 8220: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 25, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 8221: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 20, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 8224: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 15, 's', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 8225: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 15, 'l', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), 9101: (DL_TIER + 3, Start, (CogQuest, Anywhere, 500, Any), Any, ToonHQ, Any, NA, DefaultDialog), 9102: (DL_TIER + 3, Start, (CogQuest, Anywhere, 600, Any), Any, ToonHQ, Any, NA, DefaultDialog), 9103: (DL_TIER + 3, Start, (CogQuest, Anywhere, 700, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -3328,22 +3373,22 @@ QuestDict = { 9148: (DL_TIER + 3, Start, (CogTrackQuest, Anywhere, 600, 's'), Any, ToonHQ, Any, NA, DefaultDialog), 9149: (DL_TIER + 3, Start, (CogTrackQuest, Anywhere, 600, 'c'), Any, ToonHQ, Any, NA, DefaultDialog), 9150: (DL_TIER + 3, Start, (CogTrackQuest, Anywhere, 600, 'l'), Any, ToonHQ, Any, NA, DefaultDialog), - 9151: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 400, Any, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 9152: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 200, Any, 3), Any, ToonHQ, Any, NA, DefaultDialog), - 9153: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 200, Any, 4), Any, ToonHQ, Any, NA, DefaultDialog), - 9154: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 200, Any, 5), Any, ToonHQ, Any, NA, DefaultDialog), - 9155: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 100, Any, 5), Any, ToonHQ, Any, NA, DefaultDialog), - 9156: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 100, Any, 5), Any, ToonHQ, Any, NA, DefaultDialog), - 9157: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 100, Any, 5), Any, ToonHQ, Any, NA, DefaultDialog), - 9158: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 100, Any, 5), Any, ToonHQ, Any, NA, DefaultDialog), + 9151: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 400, Any, 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 9152: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 200, Any, 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 9153: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 200, Any, 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 9154: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 200, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 9155: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 100, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 9156: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 100, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 9157: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 100, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 9158: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 100, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), 9160: (DL_TIER + 3, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 45, Any, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), 9161: (DL_TIER + 3, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 45, Any, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), 9162: (DL_TIER + 3, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 45, Any, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), 9163: (DL_TIER + 3, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 45, Any, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), - 9164: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), - 9165: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), - 9166: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), - 9167: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), + 9164: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), + 9165: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), + 9166: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), + 9167: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog), 9170: (DL_TIER + 3, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 350, Any), Any, ToonHQ, Any, NA, DefaultDialog), 9171: (DL_TIER + 3, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 400, Any), Any, ToonHQ, Any, NA, DefaultDialog), 9172: (DL_TIER + 3, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 500, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -3404,8 +3449,12 @@ QuestDict = { 9229: (DL_TIER + 3, Start, (SupervisorNewbieQuest, ToontownGlobals.CashbotMintIntC, 2, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), 9500: (DL_TIER + 3, Start, (CogQuest, ToontownGlobals.DonaldsDreamland, 1000, Any), Any, ToonHQ, NA, 9501, DefaultDialog), 9501: (DL_TIER + 3, Cont, (DeliverItemQuest, 1000), Any, 2004, 1000, NA, DefaultDialog), + 9502: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 30, Any, 2, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 9503: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 25, Any, 3, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 9504: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 20, 's', 5, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 9505: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 20, 'l', 5, 1), Any, ToonHQ, Any, NA, DefaultDialog), 10001: (ELDER_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 50, Any, NEWBIE_HP), Any, ToonHQ, Any, NA, DefaultDialog), - 10002: (ELDER_TIER, Start, (BuildingNewbieQuest, Anywhere, 4, Any, 1, NEWBIE_HP), Any, ToonHQ, Any, NA, DefaultDialog), + 10002: (ELDER_TIER, Start, (BuildingNewbieQuest, Anywhere, 4, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, Any, NA, DefaultDialog), 10100: (ELDER_TIER, Start, (CogQuest, Anywhere, 80, Any), Any, ToonHQ, Any, NA, DefaultDialog), 10101: (ELDER_TIER, Start, (CogQuest, Anywhere, 100, Any), Any, ToonHQ, Any, NA, DefaultDialog), 10102: (ELDER_TIER, Start, (CogQuest, Anywhere, 120, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -3413,15 +3462,15 @@ QuestDict = { 10104: (ELDER_TIER, Start, (CogQuest, Anywhere, 250, Any), Any, ToonHQ, 615, NA, DefaultDialog), 10105: (ELDER_TIER, Start, (CogQuest, Anywhere, 300, Any), Any, ToonHQ, 616, NA, DefaultDialog), 10106: (ELDER_TIER, Start, (CogQuest, Anywhere, 400, Any), Any, ToonHQ, 618, NA, DefaultDialog), - 10110: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 40, Any, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 10111: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 30, Any, 3), Any, ToonHQ, Any, NA, DefaultDialog), - 10112: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 25, Any, 4), Any, ToonHQ, Any, NA, DefaultDialog), - 10113: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, Any, 5), Any, ToonHQ, Any, NA, DefaultDialog), - 10114: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 'm', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 10115: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 's', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 10116: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 'c', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 10117: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 'l', 5), Any, ToonHQ, Any, NA, DefaultDialog), - 10118: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 50, Any, 1), Any, ToonHQ, 620, NA, DefaultDialog), + 10110: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 40, Any, 2, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 10111: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 30, Any, 3, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 10112: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 25, Any, 4, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 10113: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 10114: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 'm', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 10115: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 's', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 10116: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 'c', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 10117: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 'l', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog), + 10118: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 50, Any, 1, 0), Any, ToonHQ, 620, NA, DefaultDialog), 10120: (ELDER_TIER, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 60, Any), Any, ToonHQ, Any, NA, DefaultDialog), 10121: (ELDER_TIER, OBSOLETE, (FactoryQuest, ToontownGlobals.SellbotHQ, 10), Any, ToonHQ, Any, NA, DefaultDialog), 10122: (ELDER_TIER, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 10), Any, ToonHQ, Any, NA, DefaultDialog), @@ -3439,12 +3488,17 @@ QuestDict = { 10147: (ELDER_TIER, Start, (SupervisorNewbieQuest, ToontownGlobals.CashbotHQ, 3, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), 10200: (ELDER_TIER, Start, (CogQuest, Anywhere, 100, Any), Any, ToonHQ, NA, 10201, DefaultDialog), 10201: (ELDER_TIER, Cont, (DeliverItemQuest, 1000), Any, ToonTailor, 1000, NA, DefaultDialog), - 10202: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 25, Any, 1), Any, ToonHQ, NA, 10203, DefaultDialog), + 10202: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 25, Any, 1, 0), Any, ToonHQ, NA, 10203, DefaultDialog), 10203: (ELDER_TIER, Cont, (DeliverItemQuest, 1000), Any, ToonTailor, 1000, NA, DefaultDialog), 10204: (ELDER_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 60, Any, NEWBIE_HP), Any, ToonHQ, NA, 10205, DefaultDialog), 10205: (ELDER_TIER, Cont, (DeliverItemQuest, 1000), Any, ToonTailor, 1000, NA, DefaultDialog), - 10206: (ELDER_TIER, Start, (BuildingNewbieQuest, Anywhere, 4, Any, 1, NEWBIE_HP), Any, ToonHQ, NA, 10207, DefaultDialog), + 10206: (ELDER_TIER, Start, (BuildingNewbieQuest, Anywhere, 4, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, NA, 10207, DefaultDialog), 10207: (ELDER_TIER, Cont, (DeliverItemQuest, 1000), Any, ToonTailor, 1000, NA, DefaultDialog), + 10208: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 40, Any, 2, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 10209: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 30, Any, 3, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 10210: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 25, Any, 4, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 10211: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 's', 5, 1), Any, ToonHQ, Any, NA, DefaultDialog), + 10212: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 'l', 5, 1), Any, ToonHQ, Any, NA, DefaultDialog), 11000: (LAWBOT_HQ_TIER, Start, (VisitQuest,), Any, 3310, NA, 11001, TTLocalizer.QuestDialogDict[11000]), 11001: (LAWBOT_HQ_TIER, Start, (RecoverItemQuest, ToontownGlobals.SillyStreet, 1, 3027, Hard, Any), Same, Same, 4100, NA, TTLocalizer.QuestDialogDict[11001]), 11002: (LAWBOT_HQ_TIER + 1, Start, (VisitQuest,), Any, 3310, NA, 11003, TTLocalizer.QuestDialogDict[11002]), diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 529cc3e4..f1089faa 100644 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -268,8 +268,6 @@ QuestsBuildingQuestFloorNumbers = ('', 'three+', 'four+', 'five+') -QuestsBuildingQuestBuilding = 'Building' -QuestsBuildingQuestBuildings = 'Buildings' QuestsBuildingQuestHeadline = 'DEFEAT' QuestsBuildingQuestProgressString = '%(progress)s of %(num)s defeated' QuestsBuildingQuestString = 'Defeat %s' @@ -280,6 +278,9 @@ QuestsBuildingQuestDescC = '%(count)s %(type)s Buildings' QuestsBuildingQuestDescCF = '%(count)s %(floors)s story %(type)s Buildings' QuestsBuildingQuestDescI = 'some %(type)s Buildings' QuestsBuildingQuestDescIF = 'some %(floors)s story %(type)s Buildings' +QuestsCogdoQuestDesc = 'a %(type)s Field Office' +QuestsCogdoQuestDescC = '%(count)s %(type)s Field Offices' +QuestsCogdoQuestDescI = 'some %(type)s Field Offices' QuestFactoryQuestFactory = 'Factory' QuestsFactoryQuestFactories = 'Factories' QuestsFactoryQuestHeadline = 'DEFEAT'