diff --git a/.vscode/settings.json b/.vscode/settings.json index 4668f9c..ec53d13 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,6 +5,6 @@ "**/*.rpymc": true, "**/cache/": true }, - "renpyWarp.sdkPath": "/home/dynamitos/.config/Code - OSS/User/globalStorage/paisleysoftworks.renpywarp/file-downloader-downloads/8.5.3", + "renpyWarp.sdkPath": "/Users/dynamitos/Library/Application Support/Code/User/globalStorage/paisleysoftworks.renpywarp/file-downloader-downloads/8.5.3", "renpyWarp.renpyExtensionsEnabled": "Enabled" } \ No newline at end of file diff --git a/game/script.rpy b/game/script.rpy index a890361..91d56e7 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -64,6 +64,9 @@ label rewind_choice: jump choice_screen "[[ Continue ]": hide screen rewind_prompt + # reset flags + $ checkpoint_set = False + $ rewind_used = False jump kaeros_arrives label choice_screen: @@ -195,22 +198,54 @@ label kaeros_arrives: show mira excited at left mira "I'm Mira, and I have a fire blessing. I can do a lot of things with it, like make bursts---" show kaeros guarded at left - kaeros "I'm Kaeros, and I have a wind blessing." + kaeros "I'm Kaeros, and I have a water blessing." kaeros "..." "Iron Hollow Mercenary" "Alright, what about you?" show sara at left sara "My name is Sara, I have a wind blessing, but its really weak. My expertise is more with strategy." "Iron Hollow Mercenary" "It's rare to have a strategist join a band of mercenaries. I hope you can at least hold your own in combat." "Iron Hollow Mercenary" "I think fo-- five people are enough for now, grab Luno and that guy over there and we'll get started." - jump first_test + jump intro_first_test -label first_test: +label spar_begin_choice: + menu: + "[[ Create Checkpoint ]" if not checkpoint_set: + $ checkpoint_set = True + scene black + with dissolve + "TODO: premonition" + scene bg training_yard + with dissolve + show sara neutral at left + show luno curious at right + jump spar_begin_choice + + + +label intro_first_test: scene black with dissolve scene bg training_yard "Iron Hollow Mercenary" "It's time to prove you worth. We are gonna start with a simple test, so everyone gets a feel for each other." "Iron Hollow Mercenary" "One-on-one fights, but since we are an uneven number, one person will have to fight twice." - return + "Iron Hollow Mercenary" "It will be a friendly spar, so using wooden weapons, and no permanent injuries allowed. First contact wins." + "Iron Hollow Mercenary" "And also, no blessings." + eron "Seems easy, can I go first?" + thinking "I'm not sure if this test is that simple. Since none of us know each other, aside from maybe these two, it is hard to judge how much to hold back without loosing instantly." + thinking "If you go all out and injure the opponent, you probably get disqualified. But if you hold back too much, you might loose in the first strike." + "Iron Hollow Mercenary" "Since you seem to be so eager, you can go first, and your opponent will be Sara." + thinking "Why does it have to be me? That guy seems to be really strong." + thinking "Maybe it's not so bad, since I can display any gift, it will be a good chance to prove my worth." + sara "Are we allowed to use the surroundings?" + "Iron Hollow Mercenary" "This is a sparring match without blessings, you are supposed to show your weapons techinques, so no." + thinking "That makes things even harder. One on one without being able to use the environment gives me not a lot of room to work with." + thinking "I don't think I can win against him in direct combat. At first glance he might seem arrogant, but from his stance I can tell he is not an amateur". + thinking "My only advantage is that he cannot use his blessing, while I can, since noone will remember." + thinking "But rewinding after every strike will consume way too much energy, I will have to use as much of my own skill as possible." + with dissolve + scene bg eron_ready + "Iron Hollow Mercenary" "Begin the match!" + jump spar_begin_choice # ── Screens ───────────────────────────────────────────────────────────────────