Commit graph

36 commits

Author SHA1 Message Date
Andrei Alexeyev
8b37d1cbf2
src: the great #include massacre of 2024 2024-05-17 14:11:48 +02:00
Andrei Alexeyev
be7905d6a3
src: run upkeep 2024-05-17 04:58:47 +02:00
Alice D
918971e7d7
fix crash in youmu dialog 2023-06-04 00:34:20 -04:00
Andrei Alexeyev
398f423c98
dialog/youmu: fix spelling in face reference 2023-06-03 23:02:53 +02:00
Andrei Alexeyev
9dade8ad33
resource: lifetime management redesign (WIP) 2023-04-29 20:01:50 +02:00
Alice D
38c334ebcc
dialog: Story/Dialogue Edits (#361)
Initial dialogue/story edits for 2023, since it's been a while since
this was all written.
2023-04-10 22:05:46 +03:00
Andrei Alexeyev
d36a0408c1
dialog/reimu: fix typo 2023-01-13 21:51:39 +01:00
Andrei Alexeyev
8d2ee76710
replace include guards with #pragma once 2021-08-31 23:34:46 +03:00
Andrei Alexeyev
93d779df43
macrohax: make MACROHAX_CONCAT useful and simplify a bunch of macros 2021-08-31 23:33:16 +03:00
Alice D
cbe07e53df
story: fix some typos and awkward wording (#316) 2021-08-13 20:21:13 +03:00
Alice D
d8d03a5699
More minor dialogue edits (#255)
* more small edits for flow, punctuation, etc

* missing quote

* fix commit

* marisa dialogue changes

* reimu dialog changes

* youmu dialogue improvements

* smartquotes

* code-review changes

* final PR review
2020-10-09 01:11:13 +03:00
Alice D
93741f5c18 fixing typo 2020-08-22 13:06:07 -04:00
Alice D
bf3c7fef05
Backport dialogue edits from yumemi branch
This is a partial cherry-pick of commits:
	eccec37982009f7196c6aeec9bd0ac94d4b8e1fd (#222)
	415c263592e9ce23fbc5080f15fde19ebec5702a (#223)

With extra stage related stuff removed
2020-08-22 09:36:25 +03:00
holycleugh
f0e2eb1118
Fix small typo in Reimu Stage 2 dialog (#238)
Co-authored-by: holycleugh <holycleugh>
2020-06-20 04:38:56 +03:00
Andrei Alexeyev
9f10dfef21
bunch of portrait and dialog-related shuffling around 2020-04-27 22:59:16 +03:00
Andrei Alexeyev
b49e518a27
Various laser changes
* More lenient collision detection
* More rounded corners
* Add a task for laser charging (not used yet)
* Make snow halation lasers not use the logic rule
  - Logic rules to be removed in favor of tasks
2020-03-04 22:26:53 +02:00
Andrei Alexeyev
51648b2f0d
stage1: implement boss appearing mid-dialogue
Also reflow the dialogue a bit
2020-03-04 22:26:51 +02:00
Alice
ed065eb38e
New story and dialogue (main story complete!) (#186)
* new story doc for Taisei Project

* more romanization fixes

* new Reimu script, yay

* accidentally stomped on some dashes

* typo in iku's dialogue

* marisa dialogue, complete!

* formatting fixes, and some timing changes

* youmu script! all three routes complete!

* youmu typoes

* remove trailing whitespaces, use smartquotes, move a couple of words around

* good/bad endings complete!

* remove unneccesary whitespaces

* revert --

* story doc typo

* formatting issues, a couple of word changes

* smart-quotes

* typoes and minor grammar changes to dialogue/story/endings

* one last typo in Marisa's dialogue

* correct smartquotes on STORY.txt
2020-03-04 22:26:50 +02:00
Andrei Alexeyev
fb19028ed5
New dialogue system powered by coroutines 2020-03-04 22:26:50 +02:00
Andrei Alexeyev
49dcd7c8d7
Remove Lalasa's contributions (by request)
This replaces the story and dialogue contents with stubs, as well as
removes Lalasa's entry from the credits, by her own request.

Fixes #179
2019-10-31 13:04:30 +02:00
Andrei Alexeyev
80fda75ffb
Dialogue updates with dynamic facial expressions and defeated character portraits (#175)
* WIP portrait faces

* character expressions for dialogue in first 3 stages (wip)

* dialog: simplified face system, new faces, script revisions (wip)

* fix wrong face name in reimu script

* cirno angry face; elly beaten variant

* render_character_portrait(): fix garbage bg and filter-bleeding

* workaround for incorrect face blending on dialog fade

* render_character_portrait(): fix bogus debug labels

* Replace sprite offsets with the more powerful paddings

* new faces for youmu, wriggle, kurumi; dialogue updates

* fix release build

* Update portraits; add Iku faces and Elly shouting face

* Add Reimu sigh face and Marisa sweat_smile face

* Add Kurumi dissatisfied face

* update Hina
2019-08-22 22:43:34 +03:00
Andrei Alexeyev
5a23fb95fc
make upkeep script preserve existing copyrights 2019-08-03 20:44:22 +03:00
Andrei Alexeyev
cf1ab225cb
basic support for portrait faces; make charselect menu more fun 2019-07-08 03:51:15 +03:00
Andrei Alexeyev
3055901998
update my email 2019-07-03 21:00:56 +03:00
Andrei Alexeyev
4159ea1249
'upkeep' target for maintenance tasks; back to include guards; happy new year! 2019-01-23 22:10:43 +02:00
Andrei Alexeyev
b4f94e7371
Some minor text revisions 2018-11-03 00:26:12 +02:00
Andrei Alexeyev
3615b95f13
Add Reimu Hakurei as a playable character (#106)
* Reimu (#101)

* add the reimu

* Add Reimu story

* account for various blunders

* add reimu dialog picture

* Reimu: WIP yin-yang orbs

* reimu: fix up indents

* Reimu: swap the shotmode names to match the kanji order in her Japanese name

* Reimu: compatibility with the latest system

* WIP ReimuA crap

* ReimuA homing trails

* more ReimuA stuff

* more ReimuA adjustments + enhanced DPS stats

* Reimu: stubs for new player animation sequences

* Reimu: occupy the 0th character slot

* Reimu: tweak needle sprite

* Reimu: buff movement speed to better match Touhou

* Reimu: fixup for the recent projectile changes

* ReimuA: make homing shots a bit smaller; give them custom effect on collision

* Reimu: add intermediate frames; move some loose sprites to the atlas

* Reimu: fix compile errors

* replace DBL_MAX by INFINITY

* Don’t draw reimu orbs twice

fixes #127

* add new reimu dialog pic

* ReimuA adjustments (mostly homing); it's still OP

* wip ReimuB gaps

* still not sure where i'm going with these gaps

* meh

* Reimu: premultiplied alpha fixups after rebase

* reimuB shot pattern with basic power scaling (not balanced at all)

* reimuB: some lame-ass particle effects

* ReimuB bomb effect prototype

* reimuA bomb prototype

* fix reimu shots for the new damage system

* Reimu: use the new player_is_bomb_active() function, add placeholder BG for ReimuB

* some reimuB bomb projectiles

* ReimuB bomb bg and some framebuffer utils required to support it.

Might reuse this at least in part for ReimuA unless we come up with
something better.

* hack to fix ReimuB bomb fade; refactoring needed

* reimuA damaging bombs

* fix ub

* prevent nan when reimuA bombs without enemies present

* add a bomb_bg to reimuA

* ...

* various fantasy seal tweaks

* Reimu: placeholder bomb sounds; slight fantasy seal buff

* fix null pointer dereference

* Reimu "balance" adjustments; minor fixes

* putting bandaids over gunshot wounds

* Add aoe damage and bullet cancel to ReimuB's bomb

* more exorcism porn

* make reimu bomb bg runes better visible on dark backgrounds

* More ReimuA shot changes
2018-08-11 22:13:48 +03:00
Andrei Alexeyev
a0eadef8c0
refactor dialog selection logic 2018-07-15 18:48:22 +03:00
Andrei Alexeyev
09946ebff9
Threading improvements (#125)
* Add a general purpose multi-threaded task manager (worker pool) for background tasks

Reimplemented screenshots off-loading using the new task manager.

* Largerly rewrite resource loading internals

They use the new task manager API now and should be generally more
robust.

* Made the game playable without threads again

* wait for resource async load task instead of intermediate state change

* remove dead code

* taskmgr: if creating a worker thread fails, try to make sure the others terminate
2018-05-25 09:01:07 +03:00
laochailan
1f9afcd3df dialog format changes 2018-05-18 20:58:40 +02:00
Andrei Alexeyev
db9c664a22
Post-battle revision for Youmu (#121) 2018-05-15 03:36:40 +03:00
Andrei Alexeyev
17e5d102b4
Post-battle revision for Reimu (#120)
* Post-battle revision for Reimu

I made some minor edits to both this one and Marisa besides the new changes.  I thought they would either be better or more grammatically correct.  Hope they're all good.

* Reimu change

Now she tells Iku to donate to the shrine, Akari. :^)

* Kurumi dialogue line change

I kind of agree with Akari's proposition (the first one), so it's changed for now.
2018-05-15 03:36:19 +03:00
Lyricana
def1f7ddc9 Post-battle revision for Marisa (#119)
* Post-battle revision for Marisa

Hopefully I'm doing this formatting correctly.

* Marisa post-battle revision for Wriggle's revision

I tried buffing it and making the silly line sound more serious.
2018-05-15 03:35:40 +03:00
laochailan
0761377f41
add reimu dialog files
I know this is not on the reimu branch but putting them here without
integrating them with the rest of the game allows Lalasa to start
editing already.
2018-04-29 20:49:43 +02:00
Andrei Alexeyev
9f74e05687
fix missing include; run update-copyright.py 2018-04-29 21:40:10 +03:00
laochailan
7a957846fa
move the dialog into centralized files 2018-04-29 10:28:21 +02:00