diff --git a/Environment/volcanoes.xml b/Environment/volcanoes.xml index d48fb2faf..6f6b1a5f8 100644 --- a/Environment/volcanoes.xml +++ b/Environment/volcanoes.xml @@ -15,4 +15,10 @@ 0 + + 0 + 0 + 0 + + diff --git a/Models/Volcanoes/Etna/ash.png b/Models/Volcanoes/Etna/ash.png new file mode 100755 index 000000000..acf8bcfdc Binary files /dev/null and b/Models/Volcanoes/Etna/ash.png differ diff --git a/Models/Volcanoes/Etna/etna.nas b/Models/Volcanoes/Etna/etna.nas new file mode 100755 index 000000000..ec216bd0a --- /dev/null +++ b/Models/Volcanoes/Etna/etna.nas @@ -0,0 +1,150 @@ + var etna_ash_loop_flag = 0; + var etna_fountain_loop_flag = 0; + + var etna_se_factor = 1.0; + var etna_ne_factor = 1.0; + + var etna_se_probability = 0.985; + var etna_ne_probability = 0.985; + + + var etna_ash_loop = func (timer) { + + if (etna_ash_loop_flag == 0) + { + print("Ending Etna ash eruption simulation."); + return; + } + + if (timer < 0.0) + { + + if (rand() > 0.6) + { + setprop("/environment/volcanoes/etna/ash-se-alpha", (rand() - 0.5) * 60.0); + setprop("/environment/volcanoes/etna/ash-se-beta", (rand() - 0.5) * 60.0); + setprop("/environment/volcanoes/etna/ash-ne-alpha", (rand() - 0.5) * 60.0); + setprop("/environment/volcanoes/etna/ash-ne-beta", (rand() - 0.5) * 60.0); + } + else + { + setprop("/environment/volcanoes/etna/ash-se-alpha", 0.0); + setprop("/environment/volcanoes/etna/ash-se-beta", 0.0); + setprop("/environment/volcanoes/etna/ash-ne-alpha", 0.0); + setprop("/environment/volcanoes/etna/ash-ne-beta", 0.0); + } + timer = 2.0 + 3.0 * rand(); + } + + timer = timer - 0.1; + + settimer(func {etna_ash_loop(timer);}, 0.1); + } + + + var etna_fountain_loop = func (timer, strength, timer_sec, strength_sec) { + + if (etna_fountain_loop_flag == 0) + { + print("Ending Etna lava fountain simulation."); + return; + } + + + if ((timer <= 0.0) and (rand() > etna_se_probability)) + { + strength = 180.0 + 70.0 * rand(); + strength *= etna_se_factor; + timer = 0.4 + 0.4 * rand(); + setprop("/environment/volcanoes/etna/ash-se-alpha", (rand() - 0.5) * 40.0); + setprop("/environment/volcanoes/etna/ash-se-beta", (rand() - 0.5) * 40.0); + } + else if (timer <= 0.0) + { + strength = strength - 3.0; + } + else + { + strength = strength - 0.5; + } + + if (strength < 10.0) {strength = 10.0;} + + + setprop("/environment/volcanoes/etna/se-strength", strength ); + setprop("/environment/volcanoes/etna/se-strength-inner", 0.95 * strength ); + setprop("/environment/volcanoes/etna/se-quantity", int(5.0*strength + rand())); + setprop("/environment/volcanoes/etna/se-quantity-inner", int(1.0*strength + 0.2 * rand())); + + timer = timer - 0.1; + + + if ((timer_sec <= 0.0) and (rand() > etna_ne_probability)) + { + strength_sec = 140.0 + 60.0 * rand(); + strength_sec *= etna_ne_factor; + timer_sec = 0.2 + 0.2 * rand(); + setprop("/environment/volcanoes/etna/ash-ne-alpha", (rand() - 0.5) * 40.0); + setprop("/environment/volcanoes/etna/ash-ne-beta", (rand() - 0.5) * 40.0); + } + else if (timer_sec <= 0.0) + { + strength_sec = strength_sec - 3.0; + } + else + { + strength_sec = strength_sec - 0.5; + } + + if (strength_sec < 10.0) {strength_sec = 10.0;} + + + setprop("/environment/volcanoes/etna/ne-strength", 0.95 * ((0.9 + 0.1 * rand()) * strength_sec) ); + setprop("/environment/volcanoes/etna/ne-strength-inner", ((0.9 + 0.1 * rand()) * strength_sec) ); + setprop("/environment/volcanoes/etna/ne-quantity", int(5.0*strength_sec + rand())); + setprop("/environment/volcanoes/etna/ne-quantity-inner", int(1.0*strength_sec + 0.2 * rand())); + + timer_sec = timer_sec - 0.1; + + settimer(func {etna_fountain_loop(timer, strength, timer_sec, strength_sec);}, 0.1); + } + + + + etna_state_manager = func { + + var state_se = getprop("/environment/volcanoes/etna/southeast-activity"); + var state_ne = getprop("/environment/volcanoes/etna/northeast-activity"); + var state_flank = getprop("/environment/volcanoes/etna/flank-activity"); + + if (((state_se > 2) or (state_ne > 2)) and (etna_ash_loop_flag == 0)) + { + print ("Starting Etna ash eruption simulation."); + etna_ash_loop_flag = 1; + etna_ash_loop(0.0); + } + else if ((state_se < 3) and (state_ne < 3) and (etna_ash_loop_flag == 1)) + { + etna_ash_loop_flag = 0; + } + + + + if (((state_se == 2) or (state_ne == 2)) and (etna_fountain_loop_flag == 0)) + { + print ("Starting Etna lava fountain simulation."); + etna_fountain_loop_flag = 1; + etna_fountain_loop(0.0, 0.0, 0.0, 0.0); + } + else if ((state_se < 2) and (state_ne < 2) and (etna_fountain_loop_flag == 1)) + { + etna_fountain_loop_flag = 0; + } + } + + # call state manager once to get correct autosaved behavior, otherwise use listener + + etna_state_manager(); + + setlistener("/environment/volcanoes/etna/southeast-activity", etna_state_manager); + setlistener("/environment/volcanoes/etna/northeast-activity", etna_state_manager); \ No newline at end of file diff --git a/Models/Volcanoes/Etna/etna_ne_ash_eruption.xml b/Models/Volcanoes/Etna/etna_ne_ash_eruption.xml new file mode 100755 index 000000000..d25104b93 --- /dev/null +++ b/Models/Volcanoes/Etna/etna_ne_ash_eruption.xml @@ -0,0 +1,142 @@ + + + + + + + etna-ne-ash-eruption + ash.png + false + false + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + + + global + + + point + + + + 0 + 5 + 0 + 360 + + 220 + 200 + + + 0 + 0 + -20 + 0 + 0 + 20 + + + + + + 5 + 1 + + + + billboard + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.5 + + + + 100.0 + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.3 + + + + 1050.0 + + + + 120 + + 6.15 + 0.05 + + + + air + false + true + + + + + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/etna_ne_ash_eruption_secondary.xml b/Models/Volcanoes/Etna/etna_ne_ash_eruption_secondary.xml new file mode 100755 index 000000000..3faae1e2a --- /dev/null +++ b/Models/Volcanoes/Etna/etna_ne_ash_eruption_secondary.xml @@ -0,0 +1,142 @@ + + + + + + + etna-ne-ash-eruption-secondary + ash.png + false + false + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + + + global + + + point + + + + 0 + 5 + 0 + 360 + + 200 + 180 + + + 0 + 0 + -20 + 0 + 0 + 20 + + + + + + 10 + 1 + + + + billboard + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.5 + + + + 100.0 + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.3 + + + + 850.0 + + + + 80 + + 6.15 + 0.05 + + + + air + false + true + + + + + + + etna-ne-ash-eruption-secondary + rotate + /environment/volcanoes/etna/ash-ne-alpha + 1 +
+ 0 + 0 + 0 +
+ + 0 + 1 + 0 + + + + + etna-ne-ash-eruption-secondary + rotate + /environment/volcanoes/etna/ash-ne-beta + 1 +
+ 0 + 0 + 0 +
+ + 1 + 0 + 0 + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/etna_ne_lava_fountain.xml b/Models/Volcanoes/Etna/etna_ne_lava_fountain.xml new file mode 100755 index 000000000..b41c92b20 --- /dev/null +++ b/Models/Volcanoes/Etna/etna_ne_lava_fountain.xml @@ -0,0 +1,146 @@ + + + + + + + etna-ne-lava-fountain + lava.png + true + false + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + + + global + + + sector + 0.0 + 25.0 + 0.0 + 360.0 + + + + 0 + 15 + 0 + 360 + + + /environment/volcanoes/etna/ne-strength + 150.0 + + + 0 + 0 + 10 + 0 + 0 + 40 + + + + + + /environment/volcanoes/etna/ne-quantity + 0 + + + + billboard + + + + + + 1.0 + + + 0.2 + + + 0.2 + + + 1.0 + + + + 4.0 + + + + + + 0.5 + + + 0.1 + + + 0.1 + + + 1.0 + + + + 4.0 + + + + 22 + + 200.0 + 0.50 + + + + air + true + true + + + + + + etna-ne-lava-fountain + rotate + /environment/volcanoes/etna/ash-ne-alpha + 1 +
+ 0 + 0 + 0 +
+ + 0 + 1 + 0 + + + + + etna-ne-lava-fountain + rotate + /environment/volcanoes/etna/ash-ne-beta + 1 +
+ 0 + 0 + 0 +
+ + 1 + 0 + 0 + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/etna_ne_lava_fountain_inner.xml b/Models/Volcanoes/Etna/etna_ne_lava_fountain_inner.xml new file mode 100755 index 000000000..93e3372ed --- /dev/null +++ b/Models/Volcanoes/Etna/etna_ne_lava_fountain_inner.xml @@ -0,0 +1,146 @@ + + + + + + + etna-ne-lava-fountain-inner + lava.png + true + false + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + + + global + + + sector + 0.0 + 10.0 + 0.0 + 360.0 + + + + 0 + 3 + 0 + 360 + + + /environment/volcanoes/etna/ne-strength-inner + 150.0 + + + 0 + 0 + 10 + 0 + 0 + 40 + + + + + + /environment/volcanoes/etna/ne-quantity-inner + 0 + + + + billboard + + + + + + 1.0 + + + 0.2 + + + 0.2 + + + 1.0 + + + + 6.0 + + + + + + 0.5 + + + 0.1 + + + 0.1 + + + 1.0 + + + + 6.0 + + + + 22 + + 200.0 + 0.50 + + + + air + true + true + + + + + + etna-ne-lava-fountain-inner + rotate + /environment/volcanoes/etna/ash-ne-alpha + 1 +
+ 0 + 0 + 0 +
+ + 0 + 1 + 0 + + + + + etna-ne-lava-fountain-inner + rotate + /environment/volcanoes/etna/ash-ne-beta + 1 +
+ 0 + 0 + 0 +
+ + 1 + 0 + 0 + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/etna_plinian_eruption.xml b/Models/Volcanoes/Etna/etna_plinian_eruption.xml new file mode 100755 index 000000000..6badea671 --- /dev/null +++ b/Models/Volcanoes/Etna/etna_plinian_eruption.xml @@ -0,0 +1,141 @@ + + + + + + + etna-plinian-eruption + ash.png + false + false + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + + + global + + + point + + + + 0 + 5 + 0 + 360 + + 550 + 500 + + + 0 + 0 + -10 + 0 + 0 + 10 + + + + + + 32 + 1 + + + + billboard + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.6 + + + + 800.0 + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.3 + + + + 8850.0 + + + + 120 + + 6.15 + 0.015 + + + + air + false + true + + + + + + etna-plinian-eruption + rotate + /environment/volcanoes/etna/ash-se-alpha + 1 +
+ 0 + 0 + 0 +
+ + 0 + 1 + 0 + + + + + etna-plinian-eruption + rotate + /environment/volcanoes/etna/ash-se-beta + 1 +
+ 0 + 0 + 0 +
+ + 1 + 0 + 0 + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/etna_se_ash_eruption.xml b/Models/Volcanoes/Etna/etna_se_ash_eruption.xml new file mode 100755 index 000000000..ec34f63c3 --- /dev/null +++ b/Models/Volcanoes/Etna/etna_se_ash_eruption.xml @@ -0,0 +1,142 @@ + + + + + + + etna-se-ash-eruption + ash.png + false + false + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + + + global + + + point + + + + 0 + 5 + 0 + 360 + + 220 + 200 + + + 0 + 0 + -20 + 0 + 0 + 20 + + + + + + 5 + 1 + + + + billboard + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.5 + + + + 100.0 + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.3 + + + + 1050.0 + + + + 120 + + 6.15 + 0.05 + + + + air + false + true + + + + + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/etna_se_ash_eruption_secondary.xml b/Models/Volcanoes/Etna/etna_se_ash_eruption_secondary.xml new file mode 100755 index 000000000..fe8eaaac1 --- /dev/null +++ b/Models/Volcanoes/Etna/etna_se_ash_eruption_secondary.xml @@ -0,0 +1,142 @@ + + + + + + + etna-se-ash-eruption-secondary + ash.png + false + false + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + + + global + + + point + + + + 0 + 5 + 0 + 360 + + 200 + 180 + + + 0 + 0 + -20 + 0 + 0 + 20 + + + + + + 10 + 1 + + + + billboard + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.5 + + + + 100.0 + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.3 + + + + 850.0 + + + + 80 + + 6.15 + 0.05 + + + + air + false + true + + + + + + + etna-se-ash-eruption-secondary + rotate + /environment/volcanoes/etna/ash-se-alpha + 1 +
+ 0 + 0 + 0 +
+ + 0 + 1 + 0 + + + + + etna-se-ash-eruption-secondary + rotate + /environment/volcanoes/etna/ash-se-beta + 1 +
+ 0 + 0 + 0 +
+ + 1 + 0 + 0 + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/etna_se_lava_fountain.xml b/Models/Volcanoes/Etna/etna_se_lava_fountain.xml new file mode 100755 index 000000000..ec5027bbb --- /dev/null +++ b/Models/Volcanoes/Etna/etna_se_lava_fountain.xml @@ -0,0 +1,146 @@ + + + + + + + etna-se-lava-fountain + lava.png + true + false + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + + + global + + + sector + 0.0 + 25.0 + 0.0 + 360.0 + + + + 0 + 15 + 0 + 360 + + + /environment/volcanoes/etna/se-strength + 150.0 + + + 0 + 0 + 10 + 0 + 0 + 40 + + + + + + /environment/volcanoes/etna/se-quantity + 0 + + + + billboard + + + + + + 1.0 + + + 0.2 + + + 0.2 + + + 1.0 + + + + 4.0 + + + + + + 0.5 + + + 0.1 + + + 0.1 + + + 1.0 + + + + 4.0 + + + + 22 + + 200.0 + 0.50 + + + + air + true + true + + + + + + etna-se-lava-fountain + rotate + /environment/volcanoes/etna/ash-se-alpha + 1 +
+ 0 + 0 + 0 +
+ + 0 + 1 + 0 + + + + + etna-se-lava-fountain + rotate + /environment/volcanoes/etna/ash-se-beta + 1 +
+ 0 + 0 + 0 +
+ + 1 + 0 + 0 + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/etna_se_lava_fountain_inner.xml b/Models/Volcanoes/Etna/etna_se_lava_fountain_inner.xml new file mode 100755 index 000000000..3f48aa02c --- /dev/null +++ b/Models/Volcanoes/Etna/etna_se_lava_fountain_inner.xml @@ -0,0 +1,146 @@ + + + + + + + etna-se-lava-fountain-inner + lava.png + true + false + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + + + global + + + sector + 0.0 + 10.0 + 0.0 + 360.0 + + + + 0 + 3 + 0 + 360 + + + /environment/volcanoes/etna/se-strength-inner + 150.0 + + + 0 + 0 + 10 + 0 + 0 + 40 + + + + + + /environment/volcanoes/etna/se-quantity-inner + 0 + + + + billboard + + + + + + 1.0 + + + 0.2 + + + 0.2 + + + 1.0 + + + + 6.0 + + + + + + 0.5 + + + 0.1 + + + 0.1 + + + 1.0 + + + + 6.0 + + + + 22 + + 200.0 + 0.50 + + + + air + true + true + + + + + + etna-se-lava-fountain-inner + rotate + /environment/volcanoes/etna/ash-se-alpha + 1 +
+ 0 + 0 + 0 +
+ + 0 + 1 + 0 + + + + + etna-se-lava-fountain-inner + rotate + /environment/volcanoes/etna/ash-se-beta + 1 +
+ 0 + 0 + 0 +
+ + 1 + 0 + 0 + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/etna_smoke_main.xml b/Models/Volcanoes/Etna/etna_smoke_main.xml new file mode 100755 index 000000000..0b95082ae --- /dev/null +++ b/Models/Volcanoes/Etna/etna_smoke_main.xml @@ -0,0 +1,107 @@ + + + + + + + stromboli-smoke + smoke_turbulent.png + false + false + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + + + local + + + point + + + + 90 + 90 + 0 + 0 + + 20 + 10 + + + 0 + 0 + -40 + 0 + 0 + 40 + + + + + + 1 + 1 + + + + billboard + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.6 + + + + 50.0 + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.1 + + + + 350.0 + + + + 120 + + 1.0 + 2.50 + + + + air + true + true + + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/etna_smoke_minor.xml b/Models/Volcanoes/Etna/etna_smoke_minor.xml new file mode 100755 index 000000000..8025d33f4 --- /dev/null +++ b/Models/Volcanoes/Etna/etna_smoke_minor.xml @@ -0,0 +1,107 @@ + + + + + + + etna-smoke-minor + smoke_turbulent.png + false + false + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + + + local + + + point + + + + 90 + 90 + 0 + 0 + + 20 + 10 + + + 0 + 0 + -40 + 0 + 0 + 40 + + + + + + 4 + 1 + + + + billboard + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.6 + + + + 10.0 + + + + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + /rendering/scene/diffuse/green + + + 0.1 + + + + 50.0 + + + + 30 + + 1.0 + 2.50 + + + + air + true + true + + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/lava.png b/Models/Volcanoes/Etna/lava.png new file mode 100755 index 000000000..bb7f943ad Binary files /dev/null and b/Models/Volcanoes/Etna/lava.png differ diff --git a/Models/Volcanoes/Etna/northeast_crater.xml b/Models/Volcanoes/Etna/northeast_crater.xml new file mode 100755 index 000000000..24fb7635e --- /dev/null +++ b/Models/Volcanoes/Etna/northeast_crater.xml @@ -0,0 +1,167 @@ + + + + + + + + + + etna_smoke_main.xml + + 50.0 + -10.0 + 0.0 + 0 + + + + + /environment/volcanoes/etna/northeast-activity + 0 + + + /environment/volcanoes/etna/northeast-activity + 3 + + + + + + + etna_smoke_minor.xml + + 0.0 + 110.0 + -20.0 + 0 + + + + + /environment/volcanoes/etna/northeast-activity + 0 + + + /environment/volcanoes/etna/northeast-activity + 3 + + + + + + + etna_smoke_minor.xml + + -120.0 + 40.0 + -20.0 + 0 + + + + + /environment/volcanoes/etna/northeast-activity + 0 + + + /environment/volcanoes/etna/northeast-activity + 3 + + + + + + + etna_smoke_minor.xml + + -60.0 + -80.0 + -20.0 + 0 + + + + + /environment/volcanoes/etna/northeast-activity + 0 + + + /environment/volcanoes/etna/northeast-activity + 3 + + + + + + + etna_ne_lava_fountain.xml + + 0.0 + 0.0 + 0.0 + 0 + + + + /environment/volcanoes/etna/northeast-activity + 2 + + + + + + etna_ne_lava_fountain_inner.xml + + 0.0 + 0.0 + 0.0 + 0 + + + + /environment/volcanoes/etna/northeast-activity + 2 + + + + + + etna_ne_ash_eruption.xml + + 0.0 + 0.0 + 0.0 + 0 + + + + /environment/volcanoes/etna/northeast-activity + 2 + + + + + + etna_ne_ash_eruption_secondary.xml + + 0.0 + 0.0 + 0.0 + 0 + + + + /environment/volcanoes/etna/northeast-activity + 2 + + + + + + + + + + + \ No newline at end of file diff --git a/Models/Volcanoes/Etna/smoke_turbulent.png b/Models/Volcanoes/Etna/smoke_turbulent.png new file mode 100755 index 000000000..f71a7ad83 Binary files /dev/null and b/Models/Volcanoes/Etna/smoke_turbulent.png differ diff --git a/Models/Volcanoes/Etna/southeast_crater.xml b/Models/Volcanoes/Etna/southeast_crater.xml new file mode 100755 index 000000000..1dfdcc9e1 --- /dev/null +++ b/Models/Volcanoes/Etna/southeast_crater.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + etna_smoke_main.xml + + -50.0 + -80.0 + 0.0 + 0 + + + + + /environment/volcanoes/etna/southeast-activity + 0 + + + /environment/volcanoes/etna/southeast-activity + 3 + + + + + + + etna_smoke_minor.xml + + -150.0 + 100.0 + 0.0 + 0 + + + + + /environment/volcanoes/etna/southeast-activity + 0 + + + /environment/volcanoes/etna/southeast-activity + 3 + + + + + + + etna_smoke_minor.xml + + 80.0 + -100.0 + -40.0 + 0 + + + + + /environment/volcanoes/etna/southeast-activity + 0 + + + /environment/volcanoes/etna/southeast-activity + 3 + + + + + + + etna_se_lava_fountain.xml + + 0.0 + 0.0 + 0.0 + 0 + + + + /environment/volcanoes/etna/southeast-activity + 2 + + + + + + etna_se_lava_fountain_inner.xml + + 0.0 + 0.0 + 0.0 + 0 + + + + /environment/volcanoes/etna/southeast-activity + 2 + + + + + + etna_se_ash_eruption.xml + + 0.0 + 0.0 + 0.0 + 0 + + + + /environment/volcanoes/etna/southeast-activity + 2 + + + + + + etna_se_ash_eruption_secondary.xml + + 0.0 + 0.0 + 0.0 + 0 + + + + /environment/volcanoes/etna/southeast-activity + 2 + + + + + + + + + + + diff --git a/Nasal/volcano.nas b/Nasal/volcano.nas index 7663e6462..70d57616d 100644 --- a/Nasal/volcano.nas +++ b/Nasal/volcano.nas @@ -113,6 +113,15 @@ geo.put_model("Models/Volcanoes/Stromboli/central_crater.xml", 38.7892, 15.2105) geo.put_model("Models/Volcanoes/Stromboli/side_crater.xml", 38.7950, 15.2139); } +var set_etna = func { + +io.include("Models/Volcanoes/Etna/etna.nas"); +geo.put_model("Models/Volcanoes/Etna/southeast_crater.xml", 37.7472, 14.9984 ); +geo.put_model("Models/Volcanoes/Etna/northeast_crater.xml", 37.7552, 14.9967 ); + +} + + # volcano definitions var kilauea = volcano.new("Kilauea", 19.39, -155.20); @@ -123,6 +132,10 @@ var stromboli = volcano.new("Stromboli", 38.78, 15.21); stromboli.set = set_stromboli; append(volcano_manager.volcano_array, stromboli); +var etna = volcano.new("Etna", 37.74, 14.99 ); +etna.set = set_etna; +append(volcano_manager.volcano_array, etna); + # start the manager when autosaved (need some delay for terrain loading to finish) diff --git a/gui/dialogs/volcano-etna.xml b/gui/dialogs/volcano-etna.xml new file mode 100644 index 000000000..968583f41 --- /dev/null +++ b/gui/dialogs/volcano-etna.xml @@ -0,0 +1,141 @@ + + + + Etna + vbox + 1 + false + 400 + + + 6 + + + + + + + + 4 + + + + + + table + + + + left + 0 + 0 + + + + + 0 + 1 + + + + se + 0 + 2 + 0 + 3 + 1 + true + /environment/volcanoes/etna/southeast-activity + + dialog-apply + se + + + + + + 0 + 3 + + + + + left + 1 + 0 + + + + + 1 + 1 + + + + ne + 1 + 2 + 0 + 3 + 1 + true + /environment/volcanoes/etna/northeast-activity + + dialog-apply + ne + + + + + + 1 + 3 + + + + + + + + + 12 + + + + + + 20 + + + + table + + + + + + + +