diff --git a/game/modules/tome/data/birth/classes/mage.lua b/game/modules/tome/data/birth/classes/mage.lua index 0bc1d2e035cf63ab3e73d5d8c25867d76ffa8fe1..cc4eb290c43deaf6a5b884fa31da33eb0849571e 100644 --- a/game/modules/tome/data/birth/classes/mage.lua +++ b/game/modules/tome/data/birth/classes/mage.lua @@ -125,12 +125,16 @@ newBirthDescriptor{ power_source = {arcane=true}, stats = { mag=5, wil=3, cun=1, }, birth_example_particles = { - "arcane_power", function(actor) if core.shader.active(4) then actor:addParticles(Particles.new("shader_ring_rotating", 1, {radius=1.1}, {type="flames", hide_center=0, xy={0, 0}})) else actor:addParticles(Particles.new("wildfire", 1)) end end, + function(actor) + if core.shader.active(4) then actor:addParticles(Particles.new("shader_ring_rotating", 1, {radius=1.1}, {type="flames", hide_center=0, time_factor=1700, zoom=0.3, npow=1, color1={0.6, 0.3, 0.8, 1}, color2={0.8, 0, 0.8, 1}, xy={0,0}})) + else actor:addParticles(Particles.new("ultrashield", 1, {rm=180, rM=220, gm=10, gM=50, bm=190, bM=220, am=120, aM=200, radius=0.4, density=100, life=8, instop=20})) + end + end, function(actor) if core.shader.active(4) then actor:addParticles(Particles.new("shader_ring_rotating", 1, {rotation=-0.2, radius=1.1}, {type="sparks", hide_center=0, time_factor=40000, color1={0, 0, 1, 1}, color2={0, 1, 1, 1}, zoom=0.5, xy={0, 0}})) else actor:addParticles(Particles.new("uttercold", 1)) diff --git a/src/particles.c b/src/particles.c index 6fafb3ddb0742ad6a160e80c8f400628a80f77c7..630c5cfc89125915d8102754a9121256d115e094 100644 --- a/src/particles.c +++ b/src/particles.c @@ -926,7 +926,7 @@ void create_particles_thread() MAX_THREADS = nb_cpus - 1; MAX_THREADS = (MAX_THREADS < 1) ? 1 : MAX_THREADS; - MAX_THREADS = 1; + //MAX_THREADS = 1; threads = calloc(MAX_THREADS, sizeof(particle_thread)); cur_thread = 0;