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.

Sign up for GitHub

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

Better Stories System #6639

Merged
merged 18 commits into from
Jan 17, 2021
Merged

Better Stories System #6639

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8186f47
wip of dynamic story system
multimokia Nov 3, 2020
599a253
more + todos
multimokia Nov 4, 2020
81131c6
Stories but much more dynamic
multimokia Nov 4, 2020
d3ed9eb
one more todo
multimokia Nov 4, 2020
f3cb2a1
Update Monika After Story/game/script-stories.rpy
multimokia Nov 4, 2020
a9adc48
better check to acct for people who run MAS 24/7
multimokia Nov 4, 2020
f69f606
WIP, working on betterer system.
multimokia Nov 11, 2020
db419dd
optimization
multimokia Nov 13, 2020
b8ff2f6
fix dum issues
multimokia Nov 20, 2020
6fb9b11
fix more bugs
multimokia Dec 3, 2020
2b51c9e
missing category
multimokia Dec 3, 2020
95f4001
Better
multimokia Dec 3, 2020
90f1cfd
Merge remote-tracking branch 'upstream/content' into pr/6639
Booplicate Dec 30, 2020
8c2d760
Merge remote-tracking branch 'upstream/content' into FixStoryRetKeys
multimokia Jan 3, 2021
d955777
use datetime.datetime instead
multimokia Jan 3, 2021
47efcac
Merge remote-tracking branch 'upstream/content' into FixStoryRetKeys
multimokia Jan 11, 2021
1f8f578
move all story unlock func to dev file
multimokia Jan 11, 2021
27280b4
update script fix
Legendkiller21 Jan 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Monika After Story/game/event-handler.rpy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ init 6 python:
"""
Context manager wrapper for Event objects via event labels.
This has handling for when an eventlabel doesn't return an actual
event object via mas_getEV.
event object via mas_getEV.

Use as follows:
with MASev('some event label') as ev:
Expand All @@ -401,7 +401,7 @@ init 6 python:

property names should be same as used on Event object.
functions can also be used.
additionally, the resulting context object can be compared with
additionally, the resulting context object can be compared with
other event objects like normal.

In cases where the Event does not exist, the following occurs:
Expand Down Expand Up @@ -457,7 +457,7 @@ init 6 python:

def __getattr__(self, name):
if self._ev is None:

# event props
if name in MAS_EVL._default_values:
return MAS_EVL._default_values.get(name)
Expand Down
Loading