Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New (themed) difficulty/shot mode descriptions #192

Merged
merged 10 commits into from Feb 27, 2020
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -10,3 +10,4 @@ __pycache__
*.kate-swp
*~
*-autosave.kra
*.swp
Binary file removed atlas/common_ui/difficulty/easy.png
Binary file not shown.
Binary file added atlas/common_ui/difficulty/easy.webp
Binary file not shown.
Binary file removed atlas/common_ui/difficulty/hard.png
Binary file not shown.
Binary file added atlas/common_ui/difficulty/hard.webp
Binary file not shown.
Binary file removed atlas/common_ui/difficulty/lunatic.png
Binary file not shown.
Binary file added atlas/common_ui/difficulty/lunatic.webp
Binary file not shown.
Binary file removed atlas/common_ui/difficulty/normal.png
Binary file not shown.
Binary file added atlas/common_ui/difficulty/normal.webp
Binary file not shown.
4 changes: 2 additions & 2 deletions doc/STORY.txt
Expand Up @@ -84,7 +84,7 @@

A mysterious force was slowly causing yōkai and humans alike to succumb to an
intense feeling of “knowing everything.” It would start with figuring out
simple problems that they’d been struggling with, such as a technical issue
simple problems that they’d been struggling with, such as a technical issue
with a machine or perhaps a eye-catching newspaper headline.

But as it progressed, they’d become completely enveloped by it, unable to act
Expand Down Expand Up @@ -154,7 +154,7 @@
door, she has no choice but to put her book down and spring into action.


○ Unbelievably Ordinary Human ~ Kirisame Marisa
○ Unbelievably Ordinary Magician ~ Kirisame Marisa
Species: Human
Area of Study: Eclecticism

Expand Down
Binary file modified resources/00-taisei.pkgdir/gfx/atlas_common_ui_0.webp
Binary file not shown.
2 changes: 1 addition & 1 deletion resources/00-taisei.pkgdir/gfx/boss_indicator.spr
Expand Up @@ -2,7 +2,7 @@

texture = atlas_common_ui_0
region_x = 2
region_y = 226
region_y = 2
region_w = 140
region_h = 40

Expand Down
8 changes: 4 additions & 4 deletions resources/00-taisei.pkgdir/gfx/difficulty/easy.spr
@@ -1,10 +1,10 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_common_ui_0
region_x = 334
region_y = 206
region_w = 305
region_h = 200
region_x = 518
region_y = 2
region_w = 312
region_h = 205

# -- Pasted from the override file --

Expand Down
8 changes: 4 additions & 4 deletions resources/00-taisei.pkgdir/gfx/difficulty/hard.spr
@@ -1,10 +1,10 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_common_ui_0
region_x = 643
region_y = 206
region_w = 271
region_h = 200
region_x = 2
region_y = 459
region_w = 290
region_h = 215

# -- Pasted from the override file --

Expand Down
8 changes: 4 additions & 4 deletions resources/00-taisei.pkgdir/gfx/difficulty/lunatic.spr
@@ -1,10 +1,10 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_common_ui_0
region_x = 334
region_y = 2
region_w = 343
region_h = 200
region_x = 2
region_y = 226
region_w = 393
region_h = 229

# -- Pasted from the override file --

Expand Down
8 changes: 4 additions & 4 deletions resources/00-taisei.pkgdir/gfx/difficulty/normal.spr
@@ -1,10 +1,10 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_common_ui_0
region_x = 681
region_y = 2
region_w = 335
region_h = 200
region_x = 399
region_y = 226
region_w = 330
region_h = 197

# -- Pasted from the override file --

Expand Down
4 changes: 2 additions & 2 deletions resources/00-taisei.pkgdir/gfx/hud/heart.spr
@@ -1,8 +1,8 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_common_ui_0
region_x = 182
region_y = 226
region_x = 146
region_y = 2
region_w = 32
region_h = 28

Expand Down
4 changes: 2 additions & 2 deletions resources/00-taisei.pkgdir/gfx/hud/star.spr
@@ -1,8 +1,8 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_common_ui_0
region_x = 146
region_y = 226
region_x = 182
region_y = 2
region_w = 32
region_h = 30

Expand Down
4 changes: 2 additions & 2 deletions resources/00-taisei.pkgdir/gfx/menu/arrow.spr
@@ -1,8 +1,8 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_common_ui_0
region_x = 918
region_y = 206
region_x = 296
region_y = 459
region_w = 50
region_h = 100

Expand Down
4 changes: 2 additions & 2 deletions resources/00-taisei.pkgdir/gfx/menu/logo.spr
@@ -1,8 +1,8 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_common_ui_0
region_x = 2
region_y = 2
region_x = 399
region_y = 427
region_w = 328
region_h = 220

Expand Down
2 changes: 1 addition & 1 deletion resources/00-taisei.pkgdir/gfx/spell.spr
Expand Up @@ -2,7 +2,7 @@

texture = atlas_common_ui_0
region_x = 2
region_y = 410
region_y = 46
region_w = 512
region_h = 176

Expand Down
4 changes: 2 additions & 2 deletions resources/00-taisei.pkgdir/gfx/star.spr
@@ -1,8 +1,8 @@
# Autogenerated by the atlas packer, do not modify

texture = atlas_common_ui_0
region_x = 972
region_y = 206
region_x = 218
region_y = 2
region_w = 40
region_h = 40

Expand Down
8 changes: 4 additions & 4 deletions src/menu/difficultyselect.c
Expand Up @@ -40,10 +40,10 @@ MenuData* create_difficulty_menu(void) {
m->transition = TransFadeBlack;
m->flags = MF_Abortable;

add_menu_entry(m, "“All those bullets confuse me!”\nYou will be stuck here forever", set_difficulty, (void *)D_Easy);
add_menu_entry(m, "“Do you even graze?”\nSomewhat challenging", set_difficulty, (void *)D_Normal);
add_menu_entry(m, "“Pain is my ally!”\nActually challenging", set_difficulty, (void *)D_Hard);
add_menu_entry(m, "“I have no fear.”\nWe never playtested this one", set_difficulty, (void *)D_Lunatic);
add_menu_entry(m, "For those just beginning\ntheir academic careers", set_difficulty, (void *)D_Easy);
add_menu_entry(m, "All those years of study\nhave finally paid off", set_difficulty, (void *)D_Normal);
add_menu_entry(m, "You must really\nlove books", set_difficulty, (void *)D_Hard);
add_menu_entry(m, "You either die a student,\nor live long enough to\nbecome a professor", set_difficulty, (void *)D_Lunatic);

for(int i = 0; i < m->ecount; ++i) {
Difficulty d = (Difficulty)(uintptr_t)m->entries[i].arg;
Expand Down
2 changes: 1 addition & 1 deletion src/plrmodes/marisa.c
Expand Up @@ -18,7 +18,7 @@ PlayerCharacter character_marisa = {
.lower_name = "marisa",
.proper_name = "Marisa",
.full_name = "Kirisame Marisa",
.title = "Ordinary Black Magician",
.title = "Unbelievably Ordinary Magician",
.dialog_base_sprite_name = "dialog/marisa",
.player_sprite_name = "player/marisa",
.menu_texture_name = "marisa_bombbg",
Expand Down
2 changes: 1 addition & 1 deletion src/plrmodes/marisa_a.c
Expand Up @@ -673,7 +673,7 @@ static void marisa_laser_preload(void) {

PlayerMode plrmode_marisa_a = {
.name = "Illusion Laser",
.description = "Kill it with lasers! Dodging is easy when nobody's firing. Just shoot them in the face, if they have one.",
.description = "Magic missiles and lasers — simple and to the point. They’ve never let you down before, so why stop now?",
.spellcard_name = "Pure Love “Galactic Spark”",
.character = &character_marisa,
.dialog = &dialog_tasks_marisa,
Expand Down
2 changes: 1 addition & 1 deletion src/plrmodes/marisa_b.c
Expand Up @@ -365,7 +365,7 @@ static void marisa_star_preload(void) {

PlayerMode plrmode_marisa_b = {
.name = "Stellar Vortex",
.description = "Loads and loads of bullets. Some of them are bound to hit. That's called “homing”, right?",
.description = "As many bullets as there are stars in the sky. Some of them are bound to hit. That's called “homing”, right?",
.spellcard_name = "Magic Sign “Stellar Vortex”",
.character = &character_marisa,
.dialog = &dialog_tasks_marisa,
Expand Down
2 changes: 1 addition & 1 deletion src/plrmodes/reimu.c
Expand Up @@ -20,7 +20,7 @@ PlayerCharacter character_reimu = {
.lower_name = "reimu",
.proper_name = "Reimu",
.full_name = "Hakurei Reimu",
.title = "Shrine Maiden of Paradise",
.title = "Shrine Maiden of Fantasy",
.dialog_base_sprite_name = "dialog/reimu",
.player_sprite_name = "player/reimu",
.menu_texture_name = "reimubg",
Expand Down
2 changes: 1 addition & 1 deletion src/plrmodes/reimu_a.c
Expand Up @@ -699,7 +699,7 @@ static double reimu_spirit_property(Player *plr, PlrProperty prop) {

PlayerMode plrmode_reimu_a = {
.name = "Yōkai Buster",
.description = "Sometimes it is easier to let your resolve do the aiming.",
.description = "The tried-and-true: homing bullets and sharp needles. You don’t have the luxury of time to think about things.",
StarWitch marked this conversation as resolved.
Show resolved Hide resolved
.spellcard_name = "Spirit Sign “Fantasy Seal —Burst—”",
.character = &character_reimu,
.dialog = &dialog_tasks_reimu,
Expand Down
2 changes: 1 addition & 1 deletion src/plrmodes/reimu_b.c
Expand Up @@ -602,7 +602,7 @@ static void reimu_dream_init(Player *plr) {

PlayerMode plrmode_reimu_b = {
.name = "Dream Shaper",
.description = "Bend the boundaries of space like the ribbon in your hair.",
.description = "Utilize Non-Euclidean geometry you borrowed from a ’friend,’ and tie the boundaries of space-time into knots as easily as the ribbons in your hair.",
StarWitch marked this conversation as resolved.
Show resolved Hide resolved
.spellcard_name = "Dream Sign “Ethereal Boundary Rupture”",
.character = &character_reimu,
.dialog = &dialog_tasks_reimu,
Expand Down
2 changes: 1 addition & 1 deletion src/plrmodes/youmu.c
Expand Up @@ -18,7 +18,7 @@ PlayerCharacter character_youmu = {
.lower_name = "youmu",
.proper_name = "Yōmu",
.full_name = "Konpaku Yōmu",
.title = "Half-Phantom Girl",
.title = "Swordswoman Between Worlds",
.dialog_base_sprite_name = "dialog/youmu",
.player_sprite_name = "player/youmu",
.menu_texture_name = "youmu_bombbg1",
Expand Down
4 changes: 2 additions & 2 deletions src/plrmodes/youmu_a.c
Expand Up @@ -547,8 +547,8 @@ static void youmu_mirror_bomb_logic(Player *plr) {

PlayerMode plrmode_youmu_a = {
.name = "Soul Reflection",
.description = "Your dual nature shall lend you a hand… or a tail.",
.spellcard_name = "Soul Sign “Reality-piercing Apparition”",
.description = "Human and phantom act together towards a singular purpose. Your inner duality shall lend you a hand… or a tail.",
.spellcard_name = "Soul Sign “Reality-Piercing Apparition”",
.character = &character_youmu,
.dialog = &dialog_tasks_youmu,
.shot_mode = PLR_SHOT_YOUMU_MIRROR,
Expand Down
2 changes: 1 addition & 1 deletion src/plrmodes/youmu_b.c
Expand Up @@ -488,7 +488,7 @@ static void youmu_haunting_init(Player *plr) {

PlayerMode plrmode_youmu_b = {
.name = "Haunting Revelation",
.description = "Ghosts are real, and quite hospitable too. The Netherworld shall welcome your foes, if you choose a good time to send the invitation.",
.description = "Ghosts are real, but they’re nothing to be afraid of. Unless, of course, you happen to stand in the way of a determined sword-wielding lady…",
.spellcard_name = "Aegis Sword “Saigyō Omnidirectional Slash”",
.character = &character_youmu,
.dialog = &dialog_tasks_youmu,
Expand Down