Skip to content

Commit

Permalink
Added a song, Coastal Pavement in Early Fall.
Browse files Browse the repository at this point in the history
  • Loading branch information
Espyo committed Sep 23, 2024
1 parent 76ab861 commit 1b8d0b2
Show file tree
Hide file tree
Showing 12 changed files with 927 additions and 14 deletions.
10 changes: 5 additions & 5 deletions Game_data/Areas/Mission/Tutorial Meadow/Data.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name=Tutorial Meadow
subtitle=Get the treasure
description=A tutorial area to help you learn how to play Pikifen!
tags=Tutorial
maker=Espyo
version=1.1.0
engine_version=0.25.0
subtitle=Get the treasure
difficulty=1
bg_bmp=Grass_dark.jpg
bg_color=0 0 0
bg_dist=1.0000
bg_zoom=1.0000
song=Coastal Pavement in Early Fall
weather
day_time_start=420
day_time_speed=0
maker=Espyo
version=1.1.0
engine_version=0.25.0
notes
spray_amounts
mission_goal=Collect treasures
mission_goal_all_mobs=true
Expand Down
13 changes: 13 additions & 0 deletions Game_data/Audio/Music/Songs/Coastal_Pavement_in_Early_Fall.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name = Coastal Pavement in Early Fall
description = A nice, calm song with an accordion lead, and a guitar for flavor.

tags = Area; Calm; Reflective
maker = Espyo
version = 1.0.0
engine_version = 1.0.0
notes = This song is an original creation for Pikifen.

main_track = Coastal_Pavement_in_Early_Fall.ogg
mix_tracks {
enemy = Coastal_Pavement_in_Early_Fall_enemy.ogg
}
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions Manual/content/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ <h2 id="0.26.0">0.26.0</h2>
<p><b>Gameplay changes</b></p>

<ul>
<li><span class="cl-a">Added</span> some songs.</li>
<li><span class="cl-a">Added</span> some new sounds.</li>
<li><span class="cl-a">Added</span> boredom, crushed, flailing, and shaking animations to <a href="mob_pikmin.html">Pikmin</a>.</li>
<li><span class="cl-a">Added</span> a new <a href="area.html">area</a>: Olympian Ruins.</li>
Expand Down
1 change: 1 addition & 0 deletions Manual/content/credits.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ <h2 id="engine">Engine</h2>
<li><a href="https://www.audacityteam.org/">Audacity</a></li>
<li>Chaos Bank V2 Soundfont</li>
<li><a href="https://www.dskmusic.com">DSK Music</a>'s VSTs</li>
<li><a href="https://plugins4free.com/plugin/302/">Accordion</a> VST by Safwan Matni</li>
<li><a href="https://neovst.com/elementor-13775/">Sound Magic</a>'s Strings One VST</li>
<li><a href="https://github.com/ocornut/imgui">Dear ImGui</a></li>
<li><a href="https://codelite.org/">Codelite</a></li>
Expand Down
7 changes: 6 additions & 1 deletion Manual/content/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,12 @@
<li>
Areas
<ul>
<li><a href="area.html">Making areas</a> to play on</li>
<li>
<a href="area.html">Making areas</a> to play on
<ul>
<li><a href="area_tips.html">Area tips</a></li>
</ul>
</li>
</ul>
</li>
<li>
Expand Down
6 changes: 3 additions & 3 deletions Manual/content/music.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ <h4 id="props-common">Common</h3>
All of the <a href="making.html#content-props">common content properties</a>. In the notes, you should write down where this song originates from, if it's the direct song, a remix, or an original creation by you, who the artist is, who composed it, and so on. As for the tags, try these examples:
<ul>
<li>Use: Menu, Area, Sunset, Battle, Cutscene</li>
<li>General characteristics: Simple, Long, Specific, Gimmick, Lyrics</li>
<li>Theme that it goes well with: Forest, Beach, Snow, Cave, Man-Made, Swamp</li>
<li>Mood: Cheerful, Gloomy, Mysterious, Calm, Energetic</li>
<li>General characteristics: Short, Long, Specific, Gimmick, Lyrics</li>
<li>Theme that it goes well with: Forest, Beach, Snow, Cave, Man-made, Swamp</li>
<li>Mood: Cheerful, Gloomy, Mysterious, Calm, Energetic, Reflective</li>
<li>Genre: Jazz, Rock, Blues, Bossa Nova</li>
</ul>
</li>
Expand Down
15 changes: 14 additions & 1 deletion Source/documents/Misc. info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,20 @@ Tips for when you're making content

Technical prowesses
Edge offset effects



When adding a song
Export as OGG, "sinc best" interpolation
Add its LMMS project to the source code -- .mmp, not .mmpz
Credit the instruments used in the credits page
Edit the file's metadata
Title (add something like "(enemy track)" if needed)
Artist: André 'Espyo' Silva
Composer: André 'Espyo' Silva
BPM
Year
Comment (trim as necessary): Original composition for Pikifen. This is an extra track overlaid on top of the main track.


Bag of notes (useful stuff)
If mobs start moving so fast that they can clip through walls
Expand Down
877 changes: 877 additions & 0 deletions Source/documents/Music/Coastal Pavement in Early Fall.mmp

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Source/documents/Todo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Next tasks (roughly sorted most important first)
If an object is on-camera and a child object is not, or vice-versa, they'll desync. Especially notable with the electric wire (thanks Helodity)
If you're on an elevator platform, you won't be able to throw Winged Pikmin
Winged Pikmin are too high to be hit by a bomb rock explosion (thanks Arcadius)
"quick bug i found with the shadow fix, ding particles now render under them" --Helodity

--- 0.26 ---
https://github.com/Helodity/Pikifen/tree/throwing-improvements
Expand Down Expand Up @@ -740,6 +741,7 @@ Misc things (so I don't forget)
You can pick a mob's focused mob, you can pick a mob from the entire area that matches a certain filter of type/category/variable value, you can pick the mob's parent mob, etc.
Global script variables
An else_if action
An action that returns to the previous state. Useful for creating utility states that mimic functions
More ideas of actions from Game Builder Garage's Nodon
New events
[NEEDS BRAINSTORMING] on_carrying_lift and on_carrying_drop events?
Expand Down
9 changes: 5 additions & 4 deletions Source/source/game_states/main_menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "../functions.h"
#include "../game.h"
#include "../load.h"
#include "../utils/allegro_utils.h"
#include "../utils/string_utils.h"


Expand Down Expand Up @@ -71,9 +72,9 @@ void main_menu_state::do_drawing() {

draw_text(
"Pikifen and contents are fan works. Pikmin is (c) Nintendo.",
game.sys_assets.fnt_standard,
game.sys_assets.fnt_slim,
point(8, game.win_h - 8),
point(game.win_w * 0.45f, game.win_h * 0.02f), COLOR_WHITE,
point(game.win_w * 0.45f, game.win_h * 0.02f), map_alpha(192),
ALLEGRO_ALIGN_LEFT, V_ALIGN_MODE_BOTTOM
);
string version_text;
Expand All @@ -87,9 +88,9 @@ void main_menu_state::do_drawing() {
version_text +=
"Pikifen " + get_engine_version_string();
draw_text(
version_text, game.sys_assets.fnt_standard,
version_text, game.sys_assets.fnt_slim,
point(game.win_w - 8, game.win_h - 8),
point(game.win_w * 0.45f, game.win_h * 0.02f), COLOR_WHITE,
point(game.win_w * 0.45f, game.win_h * 0.02f), map_alpha(192),
ALLEGRO_ALIGN_RIGHT, V_ALIGN_MODE_BOTTOM
);

Expand Down

0 comments on commit 1b8d0b2

Please sign in to comment.