Merge branch 'master' into 'master'

Nayran Update 3

See merge request spnati/spnati.gitlab.io!994

opponents/nayru/markers.xml

@@ -5,6 +5,7 @@
     <marker scope="Private" name="assessment">Nayru assesses the table and makes a comment about the sort gathered. She often has no reason to do so repeatedly.</marker>
     <marker scope="Public" name="badhand">Nayru inquires about just what a bad hand is. Thus, she doesn't need to repeat herself.</marker>
     <marker scope="Public" name="confused">The player just lost with a great hand. Done to set up "surprise", and prevent spam.</marker>
+    <marker scope="Public" name="despair">"Suffer defeat! Know despair!"</marker>
     <marker scope="Public" name="dire">Nayru senses an evil like nothing she's felt before.</marker>
     <marker scope="Public" name="drinks_response">At Sei's inquiry, Nayru typically refuses a drink. Late enough into the game, however, she may go along with it...</marker>
     <marker scope="Public" name="fakeout">Joey's fakeout just caught her. Used as a failsafe, since Joey's code strips 2 bras.</marker>
@@ -12,22 +13,37 @@
     <marker scope="Public" name="filter-bluehair">Nayru comments on someone besides her having blue hair.</marker>
     <marker scope="Public" name="firsthand">The first hand of the game. Used as a failsafe.</marker>
     <marker scope="Private" name="flor_fled">Florina has fled during her first strip round.</marker>
+    <marker scope="Public" name="forgiveness">Veran offers forgiveness during a minor round; this keeps her from getting too angry.</marker>
     <marker scope="Public" name="harped">Nayru had commented on her harp. Used to prevent spam.</marker>
     <marker scope="Public" name="justfinished">Her first line upon finishing; used to ensure the "standing up" pose occurs only once.</marker>
     <marker scope="Public" name="justnow">Nayru expresses disappointment at how poorly she's doing. (removed minor, male; rounds 5-7</marker>
     <marker scope="Public" name="kyu_intro">Nayru mistakes Kyu for a Great Fairy during the hand-quality phase</marker>
+    <marker scope="Public" name="left">Handshake for determining positional targeting; round 1 handshake attempt</marker>
+    <marker scope="Public" name="leftmost">Handshake for determining positional targeting; round 0 handshake attempt</marker>
     <marker scope="Public" name="lessdire">Nayru ignores dire evil, because she's been wrong before.</marker>
+    <marker scope="Public" name="mahiru_cam_call">Hidden marker (doesn't change dialogue) to set up the Mahiru snapshot chain. Marker 0 of snapshot chain. Given on the must strip stage.</marker>
+    <marker scope="Public" name="mahiru_intro">Intro for Mahiru</marker>
+    <marker scope="Public" name="mahiru_keep">Marker 3 of snapshot chain. Given as Nayru asks Mahiru to keep the picture safe. Hand quality phase.</marker>
+    <marker scope="Public" name="mahiru_keepsake">Marker 4 of snapshot chain. Given as Nayru comments on her unfamiliarity with keepsakes in general. Hand quality phase.</marker>
+    <marker scope="Public" name="mahiru_keese">Marker 2 of snapshot chain. Given as Nayru says "Keese!"; stripped stage.</marker>
+    <marker scope="Public" name="mahiru_snap">Marker 1 of snapshot chain. Given as Nayru asks for a picture; stripping stage.</marker>
     <marker scope="Public" name="maleplayer">Because the player has stripped once, Nayru now permanently remembers the player's gender.</marker>
     <marker scope="Public" name="MP_finaldong">Set when Nayru sees a male player preparing to remove their final lower item.</marker>
     <marker scope="Public" name="nines">Nayru introduces herself to 9s</marker>
     <marker scope="Public" name="null-possess">Nayru is beginning to feel more comfortable, as well as more skilled at the game. If not met, Veran will take over out of shame for Nayru's pitiful display thus far.</marker>
+    <marker scope="Public" name="palutena_intro">Intro for Palutena, sans Pit</marker>
+    <marker scope="Public" name="pit_intro">Intro for Pit, sans Palutena</marker>
     <marker scope="Public" name="poss_draw">The first instance of drawing/swapping after the possession. Veran's first real line.</marker>
     <marker scope="Public" name="poss_hand">The first hand while possessed. Prevents spam.</marker>
     <marker scope="Public" name="possess">If someone forfeits before Nayru gets comfortable, she has a 50/50 chance to give this marker; prevents most null-possess markers down the road</marker>
     <marker scope="Public" name="pretense">Nayru makes a comment during an early must_masturbate phase about how oracles are above such debasement.</marker>
+    <marker scope="Public" name="right">Handshake for determining positional targeting; round 2 handshake attempt</marker>
+    <marker scope="Public" name="shima_panty" />
+    <marker scope="Public" name="start_forfeit">Round 1 of the forfeit; currently only used by Veran</marker>
     <marker scope="Public" name="storyend">It's not a very good story. (Veran, 5-7, female losing minor)</marker>
     <marker scope="Public" name="storytime">Veran tells a story!</marker>
     <marker scope="Public" name="surprise">Upon seeing the player's excellent hand, Nayru realizes that the player actually lost with it.</marker>
+    <marker scope="Public" name="v_forfeit">(Invisible) Marker set to enable Veran's forfeit. Determined by level of nudity at the table.</marker>
     <marker scope="Private" name="Veran1">Nayru begins to explain why she lets Veran control her; they've come to an agreement.</marker>
     <marker scope="Private" name="Veran2">Veran's limited in some way by something at the Inventory, so Nayru's always in some amount of control.</marker>
     <marker scope="Private" name="Veran3">But Veran has certain useful skills; like poker.</marker>