Skip to content

Commit 1557bfb

Browse files
Rename reset events to leave events
1 parent 5241b06 commit 1557bfb

18 files changed

+28
-25
lines changed

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,24 @@ SwiftSplit has an "Event Stream" panel that displays events as they are triggere
9494
route files. (You can copy the text out of the panel to paste directly into the route file too).
9595

9696
### Chapter start/end events
97-
- `reset chapter` - Triggered when any chapter is reset (either by restarting the chapter or exiting to the map)
97+
- `leave chapter` - Triggered when leaving any chapter (either by restarting the chapter, returning to the map, or
98+
using "Save and Quit")
99+
- `leave chapter <n>` - Triggered when leaving chapter `<n>`
100+
- `start chapter` - Triggered when any chapter is started
98101
- `start chapter <n>` - Triggered when chapter `<n>` is started
99-
- `reset chapter <n>` - Triggered when chapter `<n>` is reset
102+
- `complete chapter` - Triggered when any chapter is completed
100103
- `complete chapter <n>` - Triggered when chapter `<n>` is completed
101104
- **A-side specific:**
102105
- `start a-side <n>` - Triggered when chapter `<n>`'s A-side is started
103-
- `reset a-side <n>` - Triggered when chapter `<n>`'s A-side is reset
106+
- `leave a-side <n>` - Triggered when leaving chapter `<n>`'s A-side
104107
- `complete a-side <n>` - Triggered when chapter `<n>`'s A-side is completed
105108
- **B-side specific:**
106109
- `start b-side <n>` - Triggered when chapter `<n>`'s B-side is started
107-
- `reset b-side <n>` - Triggered when chapter `<n>`'s B-side is reset
110+
- `leave b-side <n>` - Triggered when leaving chapter `<n>`'s B-side
108111
- `complete b-side <n>` - Triggered when chapter `<n>`'s B-side is completed
109112
- **C-side specific:**
110113
- `start c-side <n>` - Triggered when chapter `<n>`'s C-side is started
111-
- `reset c-side <n>` - Triggered when chapter `<n>`'s C-side is reset
114+
- `leave c-side <n>` - Triggered when leaving chapter `<n>`'s C-side
112115
- `complete c-side <n>` - Triggered when chapter `<n>`'s C-side is completed
113116

114117
### Screen transition event

SwiftSplit/CelesteSplitter.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ class CelesteSplitter {
118118
events.append(event)
119119
}
120120
if !new.chapterStarted && old.chapterStarted && !old.chapterComplete {
121-
var event: Event = ["return to map", "reset chapter", "reset chapter \(old.chapter)"]
121+
var event: Event = ["leave chapter", "leave chapter \(old.chapter)"]
122122
switch new.mode {
123-
case .Normal: event.add(variant: "reset a-side \(old.chapter)")
124-
case .BSide: event.add(variant: "reset b-side \(old.chapter)")
125-
case .CSide: event.add(variant: "reset c-side \(old.chapter)")
123+
case .Normal: event.add(variant: "leave a-side \(old.chapter)")
124+
case .BSide: event.add(variant: "leave b-side \(old.chapter)")
125+
case .CSide: event.add(variant: "leave c-side \(old.chapter)")
126126
default: break
127127
}
128128
events.append(event)

example/Celeste/Any%/Celeste - Any%.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useFileTime": true,
3-
"reset": "reset chapter",
3+
"reset": "leave chapter",
44
"route": [
55
"start chapter 0 ## Start Prologue",
66
"complete chapter 0",

example/Celeste/Any%/Celeste - Celestial Resort Any%.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useFileTime": false,
3-
"reset": "reset chapter",
3+
"reset": "leave chapter",
44
"route": [
55
"start chapter 3 ## Start",
66
"08-a > 09-b ## Huge Mess",

example/Celeste/Any%/Celeste - Forsaken City Any%.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useFileTime": false,
3-
"reset": "reset chapter",
3+
"reset": "leave chapter",
44
"route": [
55
"start chapter 1 ## Start",
66
"5 > 6 ## Crossing",

example/Celeste/Any%/Celeste - Golden Ridge Any%.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useFileTime": false,
3-
"reset": "reset chapter",
3+
"reset": "leave chapter",
44
"route": [
55
"start chapter 4 ## Start",
66
"a-09 > b-00 ## Shrine",

example/Celeste/Any%/Celeste - Mirror Temple Any%.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useFileTime": false,
3-
"reset": "reset chapter",
3+
"reset": "leave chapter",
44
"route": [
55
"start chapter 5 ## Start",
66
"a-13 > b-00 ## Depths",

example/Celeste/Any%/Celeste - Old Site Any%.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useFileTime": false,
3-
"reset": "reset chapter",
3+
"reset": "leave chapter",
44
"route": [
55
"start chapter 2 ## Start",
66
"d8 > d3 ## - Mirror",

example/Celeste/Any%/Celeste - Prologue.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useFileTime": false,
3-
"reset": "reset chapter",
3+
"reset": "leave chapter",
44
"route": [
55
"start chapter 0",
66
"complete chapter 0"

example/Celeste/Any%/Celeste - Reflection Any%.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useFileTime": false,
3-
"reset": "reset chapter",
3+
"reset": "leave chapter",
44
"route": [
55
"start chapter 6 ## Start",
66
"start > 00 ## Lake",

0 commit comments

Comments
 (0)