Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Add] Nebulae is now ingame! Have a screenshot?

Browse Source 
http://saracraft.net/projects/Lephisto/nebu_ingame.png
This commit is contained in:
Allanis 2013-07-22 18:41:36 +01:00
parent cc37706fb1
commit 1d5a88ba95
3 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -13,7 +13,6 @@ Major:
-- Escort commands.
-- Improved graphics.
-- Nebulae -> pre-generated plasma fractals (for a cloudlike effect).
-- Have ships flying in nebulae leave traces.
-- Missile smoke.
-- Engine glow -> need models.

86
dat/ssys.xml
View File

@ -102,34 +102,6 @@
<stars>200</stars>
</general>
</ssys>
<ssys name="Delta Pavonis">
<fleets>
<fleet chance="40">Sml Merchant Convoy</fleet>
<fleet chance="60">Pirate Hyena</fleet>
<fleet chance="40">Merchant Llama</fleet>
<fleet chance="50">Merchant Mule</fleet>
<fleet chance="100">Militia Lancelot</fleet>
</fleets>
<jumps>
<jump>Cygnus</jump>
<jump>Borla</jump>
<jump>Eridani</jump>
<jump>NCG-7273</jump>
<jump>Alteris</jump>
</jumps>
<pos>
<y>-10</y>
<x>28</x>
</pos>
<planets>
<planet>Caladan</planet>
</planets>
<general>
<asteroids>0</asteroids>
<interference>0</interference>
<stars>500</stars>
</general>
</ssys>
<ssys name="NCG-7132">
<fleets>
<fleet chance="60">Collective Sml Swarm</fleet>
@ -298,6 +270,7 @@
<general>
<asteroids>0</asteroids>
<interference>0</interference>
<nebulae volatility="0">100</nebulae>
<stars>600</stars>
</general>
</ssys>
@ -385,15 +358,9 @@
</ssys>
<ssys name="Haven">
<fleets>
<fleet chance="40">Empire Lancelot</fleet>
<fleet chance="40">Empire Lancelot</fleet>
<fleet chance="10">Empire Sml Defense</fleet>
<fleet chance="20">Merchant Mule</fleet>
<fleet chance="20">Merchant Mule</fleet>
<fleet chance="70">Pirate Hyena</fleet>
<fleet chance="70">Pirate Hyena</fleet>
<fleet chance="70">Pirate Hyena</fleet>
<fleet chance="70">Pirate Hyena</fleet>
<fleet chance="20">Empire Pacifier</fleet>
<fleet chance="40">Pirate Hyena</fleet>
</fleets>
<jumps>
<jump>NCG-7968</jump>
@ -406,6 +373,7 @@
<general>
<asteroids>0</asteroids>
<interference>0</interference>
<nebulae volatility="0">200</nebulae>
<stars>300</stars>
</general>
</ssys>
@ -434,6 +402,25 @@
<stars>200</stars>
</general>
</ssys>
<ssys name="NCG-7549">
<fleets>
<fleet chance="50">Merchant Llama</fleet>
<fleet chance="50">Pirate Hyena</fleet>
</fleets>
<jumps>
<jump>NCG-7690</jump>
</jumps>
<pos>
<y>148</y>
<x>-74</x>
</pos>
<planets/>
<general>
<asteroids>0</asteroids>
<interference>0</interference>
<stars>100</stars>
</general>
</ssys>
<ssys name="Borla">
<fleets>
<fleet chance="50">Merchant Llama</fleet>
@ -477,6 +464,7 @@
<general>
<asteroids>0</asteroids>
<interference>0</interference>
<nebulae volatility="0">150</nebulae>
<stars>400</stars>
</general>
</ssys>
@ -502,6 +490,7 @@
<general>
<asteroids>0</asteroids>
<interference>0</interference>
<nebulae volatility="0">100</nebulae>
<stars>500</stars>
</general>
</ssys>
@ -745,23 +734,32 @@
<stars>200</stars>
</general>
</ssys>
<ssys name="NCG-7549">
<ssys name="Delta Pavonis">
<fleets>
<fleet chance="50">Merchant Llama</fleet>
<fleet chance="50">Pirate Hyena</fleet>
<fleet chance="40">Sml Merchant Convoy</fleet>
<fleet chance="60">Pirate Hyena</fleet>
<fleet chance="40">Merchant Llama</fleet>
<fleet chance="50">Merchant Mule</fleet>
<fleet chance="100">Militia Lancelot</fleet>
</fleets>
<jumps>
<jump>NCG-7690</jump>
<jump>Cygnus</jump>
<jump>Borla</jump>
<jump>Eridani</jump>
<jump>NCG-7273</jump>
<jump>Alteris</jump>
</jumps>
<pos>
<y>148</y>
<x>-74</x>
<y>-10</y>
<x>28</x>
</pos>
<planets/>
<planets>
<planet>Caladan</planet>
</planets>
<general>
<asteroids>0</asteroids>
<interference>0</interference>
<stars>100</stars>
<stars>500</stars>
</general>
</ssys>
</Systems>

10
src/nebulae.c
View File

@ -353,9 +353,8 @@ void nebu_renderPuffs(const double dt, int below_player) {
/* Calculate new position. */
if(!paused) {
/* TODO: WTF?!? */
/*nebu_puffs[i].x -= player->solid->vel.x * nebu_puffs[i].height * dt;*/
/*nebu_puffs[i].y -= player->solid->vel.y * nebu_puffs[i].height * dt;*/
nebu_puffs[i].x -= player->solid->vel.x * nebu_puffs[i].height * dt;
nebu_puffs[i].y -= player->solid->vel.y * nebu_puffs[i].height * dt;
}
/* Check boundaries. */
@ -386,11 +385,14 @@ void nebu_prep(double density, double volatility) {
nebu_npuffs = density/4.;
nebu_puffs = realloc(nebu_puffs, sizeof(NebulaePuff)*nebu_npuffs);
for(i = 0; i < nebu_npuffs; i++) {
nebu_puffs[i].tex = RNG(0, NEBULAE_PUFFS-1);
/* Position. */
nebu_puffs[i].x = (double)RNG(-NEBULAE_PUFF_BUFFER,
SCREEN_W + NEBULAE_PUFF_BUFFER);
nebu_puffs[i].y = (double)RNG(-NEBULAE_PUFF_BUFFER,
SCREEN_H + NEBULAE_PUFF_BUFFER);
/* Maybe make the size related. */
nebu_puffs[i].tex = RNG(0, NEBULAE_PUFFS-1);
nebu_puffs[i].height = RNGF() + 0.2;
}
}