walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added a new original Project: Starfighter theme: Android Oppression 

This is a new theme for Starfighter! This version represents mystery
and the ominous presence of WEAPCO. Other versions will be used for
other situations, and a sort of combination between this and Last
Cyber Dance will serve as the music for the final Kline battle. That's
the theory anyway.
This commit is contained in:
Layla Marchant 2021-04-28 15:30:01 -04:00
parent 50355b9489
commit 3d0e36916d
No known key found for this signature in database
GPG Key ID: 52FB5C20A8336782
8 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
LICENSES
View File

@ -598,11 +598,10 @@ Details: Tuned down 5 half-notes.
------------------------------------------------------------------------
music/walking_among_androids.ogg
music/android_oppression.ogg
Author: Zander Noriega <https://soundcloud.com/zander-noriega>
License: CC BY 3.0 <http://creativecommons.org/licenses/by/3.0/>
Source: http://opengameart.org/content/walking-among-androids-20
Author: The Diligent Circle <https://onpon4.github.io>
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
------------------------------------------------------------------------

1
data/credits.txt
View File

@ -45,7 +45,6 @@
020 p0ss
020 Berklee
050 +++ MUSIC +++
030 Zander Noriega
020 maxstack
020 Deceased Superior Technician
020 matthew.pablo

4
music/Makefile.am
View File

@ -6,6 +6,7 @@
musicdir = $(pkgdatadir)/music
nobase_dist_music_DATA = \
android_oppression.ogg \
first_cyber_dance.ogg \
frozen_jam.ogg \
last_cyber_dance.ogg \
@ -16,8 +17,7 @@ nobase_dist_music_DATA = \
rise_of_spirit.ogg \
sound_and_silence.ogg \
space_dimensions.ogg \
through_space.ogg \
walking_among_androids.ogg
through_space.ogg
EXTRA_DIST = sources

BIN
music/android_oppression.ogg Normal file
View File

Binary file not shown.

BIN
music/sources/android_oppression.mmpz Normal file
View File

Binary file not shown.

BIN
music/walking_among_androids.ogg
View File

Binary file not shown.

4
src/defs.h
View File

@ -555,8 +555,10 @@ enum {
// Text sprites
enum {
// Main menu
TS_PRESENTS = MAX_INFOLINES,
TS_DILIGENTCIRCLE = MAX_INFOLINES,
TS_PRESENTS,
TS_AN_SDL_GAME,
TS_ORIGINALLY_BY,
TS_START_NEW_GAME,
TS_LOAD_GAME,
TS_CONTINUE_CURRENT_GAME,

23
src/title.c
View File

@ -245,8 +245,10 @@ int title_show()
prlogo = gfx_loadImage("gfx/prlogo.png");
sflogo = gfx_loadImage("gfx/sflogo.png");
gfx_createTextObject(TS_DILIGENTCIRCLE, "THE DILIGENT CIRCLE", 0, 0, FONT_WHITE);
gfx_createTextObject(TS_PRESENTS, "PRESENTS", 0, 0, FONT_WHITE);
gfx_createTextObject(TS_AN_SDL_GAME, "AN SDL GAME", 0, 0, FONT_WHITE);
gfx_createTextObject(TS_ORIGINALLY_BY, "ORIGINALLY BY", 0, 0, FONT_WHITE);
gfx_createTextObject(TS_START_NEW_GAME, _("START NEW GAME"), 0, 0, FONT_WHITE);
gfx_createTextObject(TS_LOAD_GAME, _("LOAD GAME"), 0, 0, FONT_WHITE);
gfx_createTextObject(TS_CONTINUE_CURRENT_GAME, _("CONTINUE CURRENT GAME"), 0, 0, FONT_WHITE);
@ -316,7 +318,7 @@ int title_show()
#ifdef OLD_MUSIC
audio_playMusic("music/Platinum.mod", 1, 0);
#else
audio_playMusic("music/walking_among_androids.ogg", 1, 0);
audio_playMusic("music/android_oppression.ogg", 1, 1);
#endif
while (!engine.done)
@ -342,23 +344,28 @@ int title_show()
}
}
if ((now - then > 2000) && (now - then < 8000) && (!skip))
if ((now - then > 2000) && (now - then < 7000) && (!skip))
{
screen_blit(prlogo, ((screen->w - prlogo->w) / 2), ((screen->h - prlogo->h) / 2));
screen_blitText(TS_DILIGENTCIRCLE, -1, screen->h / 2);
}
else if ((now - then > 9000) && (now - then < 15000) && (!skip))
else if ((now - then > 7500) && (now - then < 14250) && (!skip))
{
screen_blitText(TS_PRESENTS, -1, screen->h / 2);
}
else if ((now - then > 16000) && (now - then < 21000) && (!skip))
else if ((now - then > 14750) && (now - then < 21500) && (!skip))
{
screen_blitText(TS_AN_SDL_GAME, -1, screen->h / 2);
}
else if ((now - then > 25500) || (skip))
else if ((now - then > 22000) && (now - then < 29000) && (!skip))
{
screen_blitText(TS_ORIGINALLY_BY, -1, screen->h / 2 - MENU_SPACING);
screen_blit(prlogo, ((screen->w - prlogo->w) / 2), screen->h / 2);
}
else if ((now - then > 29500) || (skip))
{
screen_blit(sflogo, ((screen->w - sflogo->w) / 2), ((screen->h - sflogo->h) / 3));
if ((now - then >= 27500) || (skip))
if ((now - then >= 33250) || (skip))
{
optionRec.x = screen->w / 2 - optionRec.w / 2;
optionRec.y = (MENU_Y - 4 - MENU_SPACING) + MENU_SPACING * selectedOption;
@ -517,7 +524,7 @@ int title_show()
#ifdef OLD_MUSIC
audio_playMusic("music/Platinum.mod", 1, 0);
#else
audio_playMusic("music/walking_among_androids.ogg", 1, 0);
audio_playMusic("music/android_oppression.ogg", 1, 1);
#endif
}
else