diff --git a/opponents/mae/behaviour.xml b/opponents/mae/behaviour.xml index 73830cbef5314d8f99d10a320158b6e92d4341cb..200caf4863c4da09438af3083fa19d5b1887dd61 100644 --- a/opponents/mae/behaviour.xml +++ b/opponents/mae/behaviour.xml @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> -<!--This file was machine generated using the Character Editor v4.1 at 6:58:54 PM on May 19, 2019. Please do not edit it directly without preserving your improvements elsewhere or your changes may be lost the next time this file is generated.--> +<!--This file was machine generated using the Character Editor v4.1 at 2:38:37 AM on May 21, 2019. Please do not edit it directly without preserving your improvements elsewhere or your changes may be lost the next time this file is generated.--> <opponent> <version>v4.1</version> <first>Mae</first> @@ -206,6 +206,9 @@ <state img="0-annoyed.png">Trash. Garbage. Useless. <i>(Even a trash mammal like me deserves a better hand.)</i></state> <state img="0-thinking.png">Who invented this game anyways? And how did they figure out the probability of getting each hand?</state> </case> + <case tag="hand" alsoPlaying="akko" alsoPlayingSayingMarker="AAAAAA"> + <state img="0-surprise.png">AAAAAAAAAH!!</state> + </case> <case tag="hand" alsoPlaying="amalia" alsoPlayingStage="5" alsoPlayingTimeInStage="0"> <state img="0-why.png">Are you kidding me!? You.... freaking cheater!</state> </case> @@ -228,6 +231,10 @@ <case tag="hand" alsoPlaying="pit" alsoPlayingStage="2" notSaidMarker="pit_greek"> <state img="0-surprise.png" marker="pit_greek">Wait, you're not!? But... your clothing! Didn't the people of ancient Greece wear that kind of clothing?</state> </case> + <case tag="hand" alsoPlaying="akko" alsoPlayingSayingMarker="AAAAAA"> + <condition count="1" filter="pit" /> + <state img="0-surprise.png">AAAAAAAAAH!! <i>(Wait, why are we screaming?)</i></state> + </case> <case tag="hand" notSaidMarker="undead_marker"> <condition count="0" filter="sakura" /> <condition count="1-4" filter="undead" /> @@ -263,7 +270,7 @@ <case tag="hand" totalRounds="0" priority="9999"> <state img="0-eh.png">...Wait, this isn't Texas Hold'em?</state> <state img="0-stare.png">...So we're <i>not</i> playing Texas Hold'em?</state> - <state img="0-stare.png">...I never played this kind of</state> + <state img="0-thinking.png">I never played this kind of poker before, honestly... Or did I?</state> </case> <case tag="hand" totalRounds="1" priority="9999"> <state img="0-neutral.png" marker="possumsprings_q">Hey ~player~, I have a question. Where are you from? You're clearly not from the place I'm from.</state> @@ -275,6 +282,12 @@ <state img="0-neutral.png">Our parents told us to never interact with strangers when we were little, but here we all are now. Hello everyone.</state> <state img="0-neutral.png">Hmph. I hope you aren't expecting anything sexy, because it's literally impossible to take off your boots in a sexy manner.</state> </case> + <case tag="must_strip" alsoPlaying="akko" alsoPlayingSayingMarker="akko_merman"> + <state img="0-hype.png">Oh, I <i>wish</i>... That'd probably be one of the coolest things ever!!</state> + </case> + <case tag="must_strip" alsoPlaying="akko" notSaidMarker="possumsprings_magic"> + <state img="0-eh.png" marker="possumsprings_magic">Yes. Yes, we can. Anything to liven things up in Possum Springs.</state> + </case> <case tag="must_strip" alsoPlaying="natsuki" totalRounds="0"> <state img="0-neutral.png">I immediately regret my decision to play this game. And yeah. This is strip poker. Stick with it or go home.</state> </case> @@ -326,6 +339,9 @@ <state img="0-strip.png">These boots are perfect for kicking down doors... Adios, boots. Looks like I'm not kicking down any doors for a while.</state> <state img="0-strip.png" marker="possumsprings_a2">Hmm? Where am <i>I</i> from? Yeah, no. You don't want to hear about the rustbucket of disappointment that is Possum Springs.</state> </case> + <case tag="stripping" alsoPlaying="akko"> + <state img="0-strip.png">What you just said is so true, it actually hurts to hear it. I think that town is desperate for some magic.</state> + </case> <case tag="stripping" alsoPlaying="natsuki" totalRounds="0"> <state img="0-strip.png">Oh wow, it's almost like you're the only person who didn't know!</state> </case> @@ -1561,6 +1577,9 @@ <case tag="hand" totalRounds="4" priority="9999"> <state img="1-stare.png" marker="spookyeyes">I'm very aware of how creepy my eyes are, ~player~. Can you believe I'm the only person in my spooky old town with eyes like these?</state> </case> + <case tag="must_strip" alsoPlaying="akko" alsoPlayingSayingMarker="akko_merman"> + <state img="1-hype.png">Oh, I <i>wish</i>... That'd probably be one of the coolest things ever!!</state> + </case> <case tag="must_strip" hasHand="One Pair"> <state img="1-annoyed.png" marker="lostwithpair1">Seriously? With a pair? Lady Luck abandoned me this round, it seems.</state> </case> @@ -1635,6 +1654,15 @@ <state img="1-neutral.png" marker="nightmarefeet">Oh noooo, next time I lose, you might see my feet. My nightmare feet.</state> <state img="1-neutral.png">You want to know the true meaning of discomfort? <i>Wet socks.</i></state> </case> + <case tag="stripped" alsoPlaying="akko" priority="175"> + <state img="1-eh.png">There's... a lot I could ask from you. But, I think we should wait until the game is over before we talk about that.</state> + </case> + <case tag="stripped" alsoPlaying="akko" saidMarker="heels" priority="75"> + <state img="1-annoyed.png">Yeah, slight problem; <i>I don't know how to do magic.</i></state> + </case> + <case tag="stripped" alsoPlaying="akko" saidMarker="sexy_strip"> + <state img="1-eyes.png">Haha, yeah! You be the sexy one. I'll be the horrifying one.</state> + </case> <case tag="stripped" priority="70"> <condition count="1-4" gender="male" status="masturbating" /> <state img="1-stare.png">If I step in someone's cum while wearing this socks, I will be <i>so</i> upset.</state> @@ -3958,6 +3986,9 @@ <state img="3-why.png" marker="5newcards_bad">Are you kidding me!?</state> <state img="3-stare.png" marker="5newcards_bad">Seriously!? Me and my stupid luck...</state> </case> + <case tag="hand" alsoPlaying="akko" notSaidMarker="maeisnotstupid" priority="355"> + <state img="3-annoyed.png" marker="maeisnotstupid">...What do you mean for a "non-witch"? Are you implying we're stupid. I may be dumb, but I'm not stupid!</state> + </case> <case tag="hand" alsoPlaying="amalia" alsoPlayingStage="5" alsoPlayingTimeInStage="0"> <state img="3-why.png">Are you kidding me!? You.... freaking cheater!</state> </case> @@ -4061,6 +4092,9 @@ <state img="3-annoyed.png"><i>(Well at least my dang pants are high enough to cover part of my stomach.)</i></state> <state img="3-neutral.png">I heard some people actually dress like this. Crazy, right? Their poor shoulders.</state> </case> + <case tag="stripped" alsoPlaying="akko" saidMarker="emptyset"> + <state img="3-eh.png">No, it's... nevermind.</state> + </case> <case tag="stripped" saidMarker="bea_bras"> <state img="3-smug.png">So naturally, I chose the comfy ones. That also happen to be ugly.</state> </case> @@ -5192,6 +5226,9 @@ <state img="4-strip.png">Boobs are different, but vaginas are kinda the same... r-right?</state> <state img="4-strip.png">This... stupid game! Why did I even agree to this!</state> </case> + <case tag="stripping" alsoPlaying="akko"> + <state img="4-strip.png">No! I just like the color red! What's it to you?</state> + </case> <case tag="stripped"> <state img="4-smug.png">Wait... If you’re walking around with just underwear on, it ceases to be underwear. Checkmate, idiots.</state> <state img="4-smug.png">Hah! Isn't it funny how people wear bikinis that reveal 90% of their body, but everyone just looks at the covered parts? So polite!</state> @@ -6292,6 +6329,9 @@ <state img="5-embarrassed.png">Now you can see it. I'm not putting a razor anywhere near that place by the way. It's a disaster waiting to happen.</state> <state img="5-embarrassed.png">Yes, my hair is natural save for the reddish parts!</state> </case> + <case tag="stripped" alsoPlaying="akko"> + <state img="5-why.png">I. Don't. Use. Magic!</state> + </case> <case tag="stripped" alsoPlaying="moon"> <state img="5-embarrassed.png">Oh god, just <i>shut up!!</i> It's bad enough being naked in front of complete strangers!</state> </case> @@ -7365,6 +7405,9 @@ <state img="6-turnt.png" marker="butt">I'm not safe anymore. No matter what I do, you're always gonna see my naughty bits.</state> <state img="6-turnt.png" marker="butt">Nobody will see my nakedness if I turn around, right? ...Oh crap, now you can see my butt.</state> </case> + <case tag="stripped" alsoPlaying="akko" saidMarker="bulliable" priority="155"> + <state img="6-woah.png">W-Wait, you think <i>I'm</i> cute!?</state> + </case> <case tag="stripped" alsoPlaying="kyu" priority="155"> <state img="6-annoyed.png">It's when my partner cares about my mental health.</state> </case> @@ -7589,7 +7632,7 @@ <state img="6-flustered.png">I like this girl. A lot.</state> </case> <case tag="female_removed_major"> - <state img="6-eh.png">Being nude isn't so good when people are also getting naked.</state> + <state img="6-eh.png">I guess being nude isn't so bad when people are also getting naked.</state> <state img="6-eyes.png">Can I stare? ...Ah, what the hell, why ask when we're <i>meant</i> to stare.</state> <state img="6-flustered.png">I'm getting excited! ...And not in that way! I'm getting hyped! Very hyped!</state> </case> @@ -7907,6 +7950,9 @@ <case tag="opponent_lost" target="ryuji" targetStage="0"> <state img="6-woah.png"><i>(Woah, those legs! Why does it feel like he can break my neck with a single kick to the head?)</i></state> </case> + <case tag="opponent_lost" targetStage="0" totalExposed="3-"> + <state img="6-surprise.png">Oh <i>what the hell!!</i> Is this seriously your first loss? How good <i>are</i> you!?</state> + </case> <case tag="opponent_lost" filter="sunglasses" notSaidMarker="sunglasses_marker"> <test expr="~background.location~" value="indoors" /> <state img="6-stare.png" marker="sunglasses_marker">Y'know, when you think about it, playing poker is the only valid excuse for wearing sunglasses indoors. So consider yourself lucky, I guess.</state> @@ -8860,6 +8906,9 @@ <case tag="opponent_lost" target="moon" targetStage="1" priority="10000"> <state img="7-surprise.png">Normally I'd be excited, BUT THIS GIRL IS FREAKING ME OUT RI---</state> </case> + <case tag="opponent_lost" targetStage="0" totalExposed="3-"> + <state img="7-surprise.png">Oh <i>what the hell!!</i> Is this seriously your first loss? How good <i>are</i> you!?</state> + </case> <case tag="opponent_lost" filter="sunglasses" notSaidMarker="sunglasses_marker"> <test expr="~background.location~" value="indoors" /> <state img="7-stare.png" marker="sunglasses_marker">Y'know, when you think about it, playing poker is the only valid excuse for wearing sunglasses indoors. So consider yourself lucky, I guess.</state> @@ -9727,6 +9776,9 @@ <case tag="opponent_lost" target="pinkie_pie" targetSayingMarker="pinka_start"> <state img="8-terror.png">WHAT THE HELL!?</state> </case> + <case tag="opponent_lost" targetStage="0" totalExposed="3-"> + <state img="8-surprise.png">Oh <i>what the hell!!</i> Is this seriously your first loss? How good <i>are</i> you!?</state> + </case> <case tag="opponent_lost" filter="sunglasses" notSaidMarker="sunglasses_marker"> <test expr="~background.location~" value="indoors" /> <state img="8-stare.png" marker="sunglasses_marker">Y'know, when you think about it, playing poker is the only valid excuse for wearing sunglasses indoors. So consider yourself lucky, I guess.</state> diff --git a/opponents/mahiru/behaviour.xml b/opponents/mahiru/behaviour.xml index 8ac1a8190f6ed8064b432788d0071fa6503e1b7a..ad49a48029474eeff1a0ebe37f774d9f9b0fb629 100644 --- a/opponents/mahiru/behaviour.xml +++ b/opponents/mahiru/behaviour.xml @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='UTF-8'?> -<!--This file was machine generated using the Character Editor v4.2 at 8:18:57 PM on May 10, 2019. Please do not edit it directly without preserving your improvements elsewhere or your changes may be lost the next time this file is generated.--> +<!--This file was machine generated using the Character Editor v4.3 at 3:17:31 PM on May 19, 2019. Please do not edit it directly without preserving your improvements elsewhere or your changes may be lost the next time this file is generated.--> <opponent> - <version>v4.2</version> + <version>v4.3</version> <first>Mahiru</first> <last>Koizumi</last> <label>Mahiru</label> diff --git a/opponents/mahiru/editor.xml b/opponents/mahiru/editor.xml index df9c42703e99209de4adb5ebfa5bbad1c2554091..71ec3845b20485749840c1b6c77469ee0ed5d403 100644 --- a/opponents/mahiru/editor.xml +++ b/opponents/mahiru/editor.xml @@ -6,4 +6,57 @@ <responses /> <notes /> <nextId>0</nextId> + <markers> + <marker scope="Public" name="analresponse" /> + <marker scope="Public" name="aprilselfie" /> + <marker scope="Public" name="beaman1" /> + <marker scope="Public" name="beaman2" /> + <marker scope="Public" name="beaman3" /> + <marker scope="Public" name="beaman4" /> + <marker scope="Public" name="boldandbrash" /> + <marker scope="Public" name="boldandbrash2" /> + <marker scope="Public" name="cameraf" /> + <marker scope="Public" name="cheater9s" /> + <marker scope="Public" name="chiakiselfie" /> + <marker scope="Public" name="chibukiselfie" /> + <marker scope="Public" name="chisakiselfie" /> + <marker scope="Public" name="cocoselfie" /> + <marker scope="Public" name="confident" /> + <marker scope="Public" name="cumera" /> + <marker scope="Public" name="dr1f" /> + <marker scope="Public" name="drinkresponse" /> + <marker scope="Public" name="drv3f" /> + <marker scope="Public" name="feliciaselfie" /> + <marker scope="Public" name="fuckyoufred" /> + <marker scope="Public" name="futabaselfie" /> + <marker scope="Public" name="haruselfie" /> + <marker scope="Public" name="help" /> + <marker scope="Public" name="horny" /> + <marker scope="Public" name="ibukiselfie" /> + <marker scope="Public" name="juraselfie" /> + <marker scope="Public" name="keeping_camera" /> + <marker scope="Public" name="late" /> + <marker scope="Public" name="mavis_selfie" /> + <marker scope="Public" name="mavispicture" /> + <marker scope="Public" name="mavisselfie" /> + <marker scope="Public" name="meiaselfie" /> + <marker scope="Public" name="mettaton" /> + <marker scope="Public" name="misatoselfie" /> + <marker scope="Public" name="nagisaselfie" /> + <marker scope="Public" name="ochaselfie" /> + <marker scope="Public" name="paluselfie" /> + <marker scope="Public" name="pillowselfie" /> + <marker scope="Public" name="pitjob" /> + <marker scope="Public" name="pitpaluselfie" /> + <marker scope="Public" name="pitquestion" /> + <marker scope="Public" name="ryukoselfie" /> + <marker scope="Public" name="sakura_selfie" /> + <marker scope="Public" name="scselfie" /> + <marker scope="Public" name="self_finished" /> + <marker scope="Public" name="shy" /> + <marker scope="Public" name="solaselfie" /> + <marker scope="Public" name="sph" /> + <marker scope="Public" name="sphand" /> + <marker scope="Public" name="sphand2" /> + </markers> </metadata> diff --git a/opponents/mahiru/markers.xml b/opponents/mahiru/markers.xml deleted file mode 100644 index 485396014e3cb4e14a4af1ffb2222f6569705fee..0000000000000000000000000000000000000000 --- a/opponents/mahiru/markers.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<markers> - <marker scope="Public" name="analresponse" /> - <marker scope="Public" name="aprilselfie" /> - <marker scope="Public" name="beaman1" /> - <marker scope="Public" name="beaman2" /> - <marker scope="Public" name="beaman3" /> - <marker scope="Public" name="beaman4" /> - <marker scope="Public" name="boldandbrash" /> - <marker scope="Public" name="boldandbrash2" /> - <marker scope="Public" name="cameraf" /> - <marker scope="Public" name="cheater9s" /> - <marker scope="Public" name="chiakiselfie" /> - <marker scope="Public" name="chibukiselfie" /> - <marker scope="Public" name="chisakiselfie" /> - <marker scope="Public" name="cocoselfie" /> - <marker scope="Public" name="confident" /> - <marker scope="Public" name="cumera" /> - <marker scope="Public" name="dr1f" /> - <marker scope="Public" name="drinkresponse" /> - <marker scope="Public" name="drv3f" /> - <marker scope="Public" name="feliciaselfie" /> - <marker scope="Public" name="fuckyoufred" /> - <marker scope="Public" name="futabaselfie" /> - <marker scope="Public" name="haruselfie" /> - <marker scope="Public" name="help" /> - <marker scope="Public" name="horny" /> - <marker scope="Public" name="ibukiselfie" /> - <marker scope="Public" name="juraselfie" /> - <marker scope="Public" name="keeping_camera" /> - <marker scope="Public" name="late" /> - <marker scope="Public" name="mavis_selfie" /> - <marker scope="Public" name="mavispicture" /> - <marker scope="Public" name="mavisselfie" /> - <marker scope="Public" name="meiaselfie" /> - <marker scope="Public" name="mettaton" /> - <marker scope="Public" name="misatoselfie" /> - <marker scope="Public" name="nagisaselfie" /> - <marker scope="Public" name="ochaselfie" /> - <marker scope="Public" name="paluselfie" /> - <marker scope="Public" name="pillowselfie" /> - <marker scope="Public" name="pitjob" /> - <marker scope="Public" name="pitpaluselfie" /> - <marker scope="Public" name="pitquestion" /> - <marker scope="Public" name="ryukoselfie" /> - <marker scope="Public" name="sakura_selfie" /> - <marker scope="Public" name="scselfie" /> - <marker scope="Public" name="self_finished" /> - <marker scope="Public" name="shy" /> - <marker scope="Public" name="solaselfie" /> - <marker scope="Public" name="sph" /> - <marker scope="Public" name="sphand" /> - <marker scope="Public" name="sphand2" /> -</markers> diff --git a/opponents/mahiru/meta.xml b/opponents/mahiru/meta.xml index 2f66e1b05a71ff114df1a5a04677dda2a67bf198..5318cff8b89e3a098e26ada09db29779c6231f2f 100644 --- a/opponents/mahiru/meta.xml +++ b/opponents/mahiru/meta.xml @@ -38,6 +38,6 @@ <tag>pubic_hair</tag> </tags> <has_collectibles>false</has_collectibles> - <lines>2248</lines> + <lines>2259</lines> <poses>168</poses> </opponent> diff --git a/opponents/pit/behaviour.xml b/opponents/pit/behaviour.xml index 75a619cb361a0e33b91c7fd1d8712638bfd8cf21..6820aa170eedd4ef0e6e4e41492822e7d7373aca 100644 --- a/opponents/pit/behaviour.xml +++ b/opponents/pit/behaviour.xml @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='UTF-8'?> -<!--This file was machine generated using the Character Editor v4.2 at 6:57:51 PM on May 18, 2019. Please do not edit it directly without preserving your improvements elsewhere or your changes may be lost the next time this file is generated.--> +<!--This file was machine generated using the Character Editor v4.3 at 9:59:05 PM on May 21, 2019. Please do not edit it directly without preserving your improvements elsewhere or your changes may be lost the next time this file is generated.--> <opponent> - <version>v4.2</version> + <version>v4.3</version> <first>Pit</first> <last /> <label>Pit</label> @@ -11845,6 +11845,27 @@ <case tag="opponent_stripping" target="akko" alsoPlaying="streaming-chan" alsoPlayingNotSaidMarker="akko_crush2" alsoPlayingSayingMarker="akko_crush2"> <state img="0-sad.png">O-Oh... good for you...</state> </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_ai"> + <state img="0-awkward.png">Aww. That's a cute one.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_elma"> + <state img="0-thinking.png">I thought this one looked familiar, but... maybe I'm imagining things.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_mantis"> + <state img="0-stunned.png">Those eyes are so big... and friendly!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_phosphora"> + <state img="0-embarrassed.png">Whoa! Ph-Phosphora? Is that you? Were you this cute witch the whole time?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_princess"> + <state img="0-devoted.png">You look like you just came out of the Mushroom Kingdom!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_sakkoura"> + <state img="0-beat.png">Not to be rude, but what happened to your... proportions?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_zelda"> + <state img="0-loss.png">(Gah... she's so cute! All the beauty of Zelda with all the whimsy of a normal girl...)</state> + </case> <case tag="opponent_stripping" target="akko" targetStage="0" alsoPlaying="lotte" targetSayingMarker="akko_lotte"> <state img="0-awkward.png">Wow! You two are practically twins now!</state> </case> @@ -14794,6 +14815,15 @@ <condition count="1" filter="halloween_pit" /> <state img="0-smug.png"><i>Obviously</i> I'd win. (I'm so relieved. No one found out!)</state> </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="embarrassed" priority="379"> + <state img="0-surprised.png">Ah! Sorry, I didn't mean to draw attention to it!</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="mask_falls" priority="379"> + <state img="0-shy.png">Um, Mika? Your mask...</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="putting_mask" priority="379"> + <state img="0-loss.png">I'll just forget I ever saw anything, okay? Rainbow Mika didn't reveal anything here! Nope!</state> + </case> </stage> <stage id="1"> @@ -26345,6 +26375,27 @@ <case tag="opponent_stripping" target="akko" alsoPlaying="streaming-chan" alsoPlayingNotSaidMarker="akko_crush2" alsoPlayingSayingMarker="akko_crush2"> <state img="1-sad.png">O-Oh... good for you...</state> </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_ai"> + <state img="1-awkward.png">Aww. That's a cute one.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_elma"> + <state img="1-thinking.png">I thought this one looked familiar, but... maybe I'm imagining things.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_mantis"> + <state img="1-stunned.png">Those eyes are so big... and friendly!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_phosphora"> + <state img="1-embarrassed.png">Whoa! Ph-Phosphora? Is that you? Were you this cute witch the whole time?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_princess"> + <state img="1-devoted.png">You look like you just came out of the Mushroom Kingdom!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_sakkoura"> + <state img="1-beat.png">Not to be rude, but what happened to your... proportions?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_zelda"> + <state img="1-loss.png">(Gah... she's so cute! All the beauty of Zelda with all the whimsy of a normal girl...)</state> + </case> <case tag="opponent_stripping" target="akko" targetStage="0" alsoPlaying="lotte" targetSayingMarker="akko_lotte"> <state img="1-awkward.png">Wow! You two are practically twins now!</state> </case> @@ -29292,6 +29343,15 @@ <condition count="1" filter="halloween_pit" /> <state img="1-smug.png"><i>Obviously</i> I'd win. (I'm so relieved. No one found out!)</state> </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="embarrassed" priority="379"> + <state img="1-surprised.png">Ah! Sorry, I didn't mean to draw attention to it!</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="mask_falls" priority="379"> + <state img="1-shy.png">Um, Mika? Your mask...</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="putting_mask" priority="379"> + <state img="1-loss.png">I'll just forget I ever saw anything, okay? Rainbow Mika didn't reveal anything here! Nope!</state> + </case> </stage> <stage id="2"> @@ -40746,6 +40806,27 @@ <case tag="opponent_stripping" target="akko" alsoPlaying="streaming-chan" alsoPlayingNotSaidMarker="akko_crush2" alsoPlayingSayingMarker="akko_crush2"> <state img="2-sad.png">O-Oh... good for you...</state> </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_ai"> + <state img="2-awkward.png">Aww. That's a cute one.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_elma"> + <state img="2-thinking.png">I thought this one looked familiar, but... maybe I'm imagining things.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_mantis"> + <state img="2-stunned.png">Those eyes are so big... and friendly!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_phosphora"> + <state img="2-embarrassed.png">Whoa! Ph-Phosphora? Is that you? Were you this cute witch the whole time?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_princess"> + <state img="2-devoted.png">You look like you just came out of the Mushroom Kingdom!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_sakkoura"> + <state img="2-beat.png">Not to be rude, but what happened to your... proportions?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_zelda"> + <state img="2-loss.png">(Gah... she's so cute! All the beauty of Zelda with all the whimsy of a normal girl...)</state> + </case> <case tag="opponent_stripping" target="akko" targetStage="0" alsoPlaying="lotte" targetSayingMarker="akko_lotte"> <state img="2-awkward.png">Wow! You two are practically twins now!</state> </case> @@ -43693,6 +43774,15 @@ <condition count="1" filter="halloween_pit" /> <state img="2-smug.png"><i>Obviously</i> I'd win. (I'm so relieved. No one found out!)</state> </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="embarrassed" priority="379"> + <state img="2-surprised.png">Ah! Sorry, I didn't mean to draw attention to it!</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="mask_falls" priority="379"> + <state img="2-shy.png">Um, Mika? Your mask...</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="putting_mask" priority="379"> + <state img="2-loss.png">I'll just forget I ever saw anything, okay? Rainbow Mika didn't reveal anything here! Nope!</state> + </case> </stage> <stage id="3"> @@ -55151,6 +55241,27 @@ <case tag="opponent_stripping" target="akko" alsoPlaying="streaming-chan" alsoPlayingNotSaidMarker="akko_crush2" alsoPlayingSayingMarker="akko_crush2"> <state img="3-sad.png">O-Oh... good for you...</state> </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_ai"> + <state img="3-awkward.png">Aww. That's a cute one.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_elma"> + <state img="3-thinking.png">I thought this one looked familiar, but... maybe I'm imagining things.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_mantis"> + <state img="3-stunned.png">Those eyes are so big... and friendly!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_phosphora"> + <state img="3-embarrassed.png">Whoa! Ph-Phosphora? Is that you? Were you this cute witch the whole time?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_princess"> + <state img="3-devoted.png">You look like you just came out of the Mushroom Kingdom!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_sakkoura"> + <state img="3-beat.png">Not to be rude, but what happened to your... proportions?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_zelda"> + <state img="3-loss.png">(Gah... she's so cute! All the beauty of Zelda with all the whimsy of a normal girl...)</state> + </case> <case tag="opponent_stripping" target="akko" targetStage="0" alsoPlaying="lotte" targetSayingMarker="akko_lotte"> <state img="3-awkward.png">Wow! You two are practically twins now!</state> </case> @@ -58098,6 +58209,15 @@ <condition count="1" filter="halloween_pit" /> <state img="3-smug.png"><i>Obviously</i> I'd win. (I'm so relieved. No one found out!)</state> </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="embarrassed" priority="379"> + <state img="3-surprised.png">Ah! Sorry, I didn't mean to draw attention to it!</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="mask_falls" priority="379"> + <state img="3-shy.png">Um, Mika? Your mask...</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="putting_mask" priority="379"> + <state img="3-loss.png">I'll just forget I ever saw anything, okay? Rainbow Mika didn't reveal anything here! Nope!</state> + </case> </stage> <stage id="4"> @@ -69676,6 +69796,27 @@ <case tag="opponent_stripping" target="akko" alsoPlaying="streaming-chan" alsoPlayingNotSaidMarker="akko_crush2" alsoPlayingSayingMarker="akko_crush2"> <state img="4-sad.png">O-Oh... good for you...</state> </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_ai"> + <state img="4-awkward.png">Aww. That's a cute one.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_elma"> + <state img="4-thinking.png">I thought this one looked familiar, but... maybe I'm imagining things.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_mantis"> + <state img="4-stunned.png">Those eyes are so big... and friendly!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_phosphora"> + <state img="4-embarrassed.png">Whoa! Ph-Phosphora? Is that you? Were you this cute witch the whole time?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_princess"> + <state img="4-devoted.png">You look like you just came out of the Mushroom Kingdom!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_sakkoura"> + <state img="4-beat.png">Not to be rude, but what happened to your... proportions?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_zelda"> + <state img="4-loss.png">(Gah... she's so cute! All the beauty of Zelda with all the whimsy of a normal girl...)</state> + </case> <case tag="opponent_stripping" target="akko" targetStage="0" alsoPlaying="lotte" targetSayingMarker="akko_lotte"> <state img="4-awkward.png">Wow! You two are practically twins now!</state> </case> @@ -72623,6 +72764,15 @@ <condition count="1" filter="halloween_pit" /> <state img="4-smug.png"><i>Obviously</i> I'd win. (I'm so relieved. No one found out!)</state> </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="embarrassed" priority="379"> + <state img="4-surprised.png">Ah! Sorry, I didn't mean to draw attention to it!</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="mask_falls" priority="379"> + <state img="4-shy.png">Um, Mika? Your mask...</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="putting_mask" priority="379"> + <state img="4-loss.png">I'll just forget I ever saw anything, okay? Rainbow Mika didn't reveal anything here! Nope!</state> + </case> </stage> <stage id="5"> @@ -84000,6 +84150,27 @@ <case tag="opponent_stripping" target="akko" alsoPlaying="streaming-chan" alsoPlayingNotSaidMarker="akko_crush2" alsoPlayingSayingMarker="akko_crush2"> <state img="5-sad.png">O-Oh... good for you...</state> </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_ai"> + <state img="5-awkward.png">Aww. That's a cute one.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_elma"> + <state img="5-thinking.png">I thought this one looked familiar, but... maybe I'm imagining things.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_mantis"> + <state img="5-stunned.png">Those eyes are so big... and friendly!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_phosphora"> + <state img="5-embarrassed.png">Whoa! Ph-Phosphora? Is that you? Were you this cute witch the whole time?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_princess"> + <state img="5-devoted.png">You look like you just came out of the Mushroom Kingdom!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_sakkoura"> + <state img="5-beat.png">Not to be rude, but what happened to your... proportions?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_zelda"> + <state img="5-loss.png">(Gah... she's so cute! All the beauty of Zelda with all the whimsy of a normal girl...)</state> + </case> <case tag="opponent_stripping" target="akko" targetStage="0" alsoPlaying="lotte" targetSayingMarker="akko_lotte"> <state img="5-awkward.png">Wow! You two are practically twins now!</state> </case> @@ -87179,6 +87350,15 @@ <condition count="1" filter="halloween_pit" /> <state img="5-smug.png"><i>Obviously</i> I'd win. (I'm so relieved. No one found out!)</state> </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="embarrassed" priority="379"> + <state img="5-surprised.png">Ah! Sorry, I didn't mean to draw attention to it!</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="mask_falls" priority="379"> + <state img="5-shy.png">Um, Mika? Your mask...</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="putting_mask" priority="379"> + <state img="5-loss.png">I'll just forget I ever saw anything, okay? Rainbow Mika didn't reveal anything here! Nope!</state> + </case> </stage> <stage id="6"> @@ -98081,6 +98261,27 @@ <case tag="opponent_stripping" target="akko" alsoPlaying="streaming-chan" alsoPlayingNotSaidMarker="akko_crush2" alsoPlayingSayingMarker="akko_crush2"> <state img="6-sad.png">O-Oh... good for you...</state> </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_ai"> + <state img="6-awkward.png">Aww. That's a cute one.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_elma"> + <state img="6-thinking.png">I thought this one looked familiar, but... maybe I'm imagining things.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_mantis"> + <state img="6-stunned.png">Those eyes are so big... and friendly!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_phosphora"> + <state img="6-embarrassed.png">Whoa! Ph-Phosphora? Is that you? Were you this cute witch the whole time?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_princess"> + <state img="6-devoted.png">You look like you just came out of the Mushroom Kingdom!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_sakkoura"> + <state img="6-beat.png">Not to be rude, but what happened to your... proportions?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_zelda"> + <state img="6-loss.png">(Gah... she's so cute! All the beauty of Zelda with all the whimsy of a normal girl...)</state> + </case> <case tag="opponent_stripping" target="akko" targetStage="0" alsoPlaying="lotte" targetSayingMarker="akko_lotte"> <state img="6-awkward.png">Wow! You two are practically twins now!</state> </case> @@ -101095,6 +101296,15 @@ <case tag="finishing_masturbating"> <state img="6-finishing.png">I'M FINISHED!</state> </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="embarrassed" priority="379"> + <state img="6-surprised.png">Ah! Sorry, I didn't mean to draw attention to it!</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="mask_falls" priority="379"> + <state img="6-shy.png">Um, Mika? Your mask...</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="putting_mask" priority="379"> + <state img="6-loss.png">I'll just forget I ever saw anything, okay? Rainbow Mika didn't reveal anything here! Nope!</state> + </case> </stage> <stage id="7"> @@ -112004,6 +112214,27 @@ <case tag="opponent_stripping" target="akko" alsoPlaying="streaming-chan" alsoPlayingNotSaidMarker="akko_crush2" alsoPlayingSayingMarker="akko_crush2"> <state img="7-sad.png">O-Oh... good for you...</state> </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_ai"> + <state img="7-awkward.png">Aww. That's a cute one.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_elma"> + <state img="7-thinking.png">I thought this one looked familiar, but... maybe I'm imagining things.</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_mantis"> + <state img="7-stunned.png">Those eyes are so big... and friendly!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_phosphora"> + <state img="7-embarrassed.png">Whoa! Ph-Phosphora? Is that you? Were you this cute witch the whole time?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_princess"> + <state img="7-devoted.png">You look like you just came out of the Mushroom Kingdom!</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_sakkoura"> + <state img="7-beat.png">Not to be rude, but what happened to your... proportions?</state> + </case> + <case tag="opponent_stripping" target="akko" targetSayingMarker="akko_zelda"> + <state img="7-loss.png">(Gah... she's so cute! All the beauty of Zelda with all the whimsy of a normal girl...)</state> + </case> <case tag="opponent_stripping" target="akko" targetStage="0" alsoPlaying="lotte" targetSayingMarker="akko_lotte"> <state img="7-awkward.png">Wow! You two are practically twins now!</state> </case> @@ -115185,6 +115416,15 @@ <case tag="game_over_defeat" target="zizou" saidMarker="sidebet_loser"> <state img="7-beat.png">Wait, I lost that side bet, didn't I... gonna be weird having to serve a different goddess for a while...</state> </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="embarrassed" priority="379"> + <state img="7-surprised.png">Ah! Sorry, I didn't mean to draw attention to it!</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="mask_falls" priority="379"> + <state img="7-shy.png">Um, Mika? Your mask...</state> + </case> + <case tag="global" alsoPlaying="rainbow_mika" alsoPlayingSayingMarker="putting_mask" priority="379"> + <state img="7-loss.png">I'll just forget I ever saw anything, okay? Rainbow Mika didn't reveal anything here! Nope!</state> + </case> </stage> </behaviour> diff --git a/opponents/pit/editor.xml b/opponents/pit/editor.xml index e0ef1d486677569b807505f3b4874ce276eefc78..8e752d1c8d3440645233d806fd50e6c05605c881 100644 --- a/opponents/pit/editor.xml +++ b/opponents/pit/editor.xml @@ -6,4 +6,43 @@ <responses /> <notes /> <nextId>0</nextId> + <markers> + <marker scope="Public" name="analresponse" /> + <marker scope="Public" name="coverbow" /> + <marker scope="Public" name="dn_response" /> + <marker scope="Public" name="drinkresponse" /> + <marker scope="Public" name="finished" /> + <marker scope="Public" name="freudianslip" /> + <marker scope="Public" name="inch" /> + <marker scope="Public" name="mahirucheck" /> + <marker scope="Public" name="mahirucheck2" /> + <marker scope="Public" name="mahirucheck3" /> + <marker scope="Public" name="mahirujob" /> + <marker scope="Public" name="merula_compliment" /> + <marker scope="Public" name="natko_monika" /> + <marker scope="Public" name="natko_neutral" /> + <marker scope="Public" name="natko_sayori" /> + <marker scope="Public" name="natsujura" /> + <marker scope="Public" name="paluhug" /> + <marker scope="Public" name="palutenacall" /> + <marker scope="Public" name="pinka" /> + <marker scope="Public" name="pit_favfood" /> + <marker scope="Public" name="pit_tellme" /> + <marker scope="Public" name="pitcantread" /> + <marker scope="Public" name="pits_fetish" /> + <marker scope="Public" name="pits_fetish2" /> + <marker scope="Public" name="pizza" /> + <marker scope="Public" name="playerf" /> + <marker scope="Public" name="playerm" /> + <marker scope="Public" name="pun" /> + <marker scope="Public" name="puns" /> + <marker scope="Public" name="ragequit" /> + <marker scope="Public" name="ragequitstop" /> + <marker scope="Public" name="sacredbuns" /> + <marker scope="Public" name="sacredbuns2" /> + <marker scope="Public" name="sacredbuns3" /> + <marker scope="Public" name="sidebet_loser" /> + <marker scope="Public" name="skyworldselfie" /> + <marker scope="Public" name="threecorn" /> + </markers> </metadata> diff --git a/opponents/pit/markers.xml b/opponents/pit/markers.xml deleted file mode 100644 index a626ff939c79f0946baa355f6f11db15ebb5aae3..0000000000000000000000000000000000000000 --- a/opponents/pit/markers.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<markers> - <marker scope="Public" name="analresponse" /> - <marker scope="Public" name="coverbow" /> - <marker scope="Public" name="dn_response" /> - <marker scope="Public" name="drinkresponse" /> - <marker scope="Public" name="finished" /> - <marker scope="Public" name="freudianslip" /> - <marker scope="Public" name="inch" /> - <marker scope="Public" name="mahirucheck" /> - <marker scope="Public" name="mahirucheck2" /> - <marker scope="Public" name="mahirucheck3" /> - <marker scope="Public" name="mahirujob" /> - <marker scope="Public" name="merula_compliment" /> - <marker scope="Public" name="natko_monika" /> - <marker scope="Public" name="natko_neutral" /> - <marker scope="Public" name="natko_sayori" /> - <marker scope="Public" name="natsujura" /> - <marker scope="Public" name="paluhug" /> - <marker scope="Public" name="palutenacall" /> - <marker scope="Public" name="pinka" /> - <marker scope="Public" name="pit_favfood" /> - <marker scope="Public" name="pit_tellme" /> - <marker scope="Public" name="pitcantread" /> - <marker scope="Public" name="pits_fetish" /> - <marker scope="Public" name="pits_fetish2" /> - <marker scope="Public" name="pizza" /> - <marker scope="Public" name="playerf" /> - <marker scope="Public" name="playerm" /> - <marker scope="Public" name="pun" /> - <marker scope="Public" name="puns" /> - <marker scope="Public" name="ragequit" /> - <marker scope="Public" name="ragequitstop" /> - <marker scope="Public" name="sacredbuns" /> - <marker scope="Public" name="sacredbuns2" /> - <marker scope="Public" name="sacredbuns3" /> - <marker scope="Public" name="sidebet_loser" /> - <marker scope="Public" name="skyworldselfie" /> - <marker scope="Public" name="threecorn" /> -</markers> diff --git a/opponents/pit/meta.xml b/opponents/pit/meta.xml index ef1603df8c1c273cd9255fa0fdea05c1d5418f76..fd3a92eb5ab96395a3b58046c3c3f9c7826fe91b 100644 --- a/opponents/pit/meta.xml +++ b/opponents/pit/meta.xml @@ -44,6 +44,6 @@ <costume folder="opponents/reskins/halloween_pit/" img="0-calm.png">Dark Pit</costume> </alternates> <has_collectibles>true</has_collectibles> - <lines>5958</lines> + <lines>5969</lines> <poses>169</poses> </opponent>