diff --git a/opponents/caulifla/SSJ4 Caulifla.png b/opponents/caulifla/SSJ4 Caulifla.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc1cf04607db4a635e61ed3f43b9db45f704a62d
--- /dev/null
+++ b/opponents/caulifla/SSJ4 Caulifla.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1a7ba55e917e70bff408430c961cec9977795891c6c7e14f0dff0376ef21444
+size 177053
diff --git a/opponents/caulifla/Scouter.jpg b/opponents/caulifla/Scouter.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9e0d78b94622491090fb182ce4cbe4f843cd7d36
--- /dev/null
+++ b/opponents/caulifla/Scouter.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56b0800e64ff4b0d644acaf5f8c2458d6b865b4f0a12697f1ec642ab14cc659f
+size 39840
diff --git a/opponents/caulifla/behaviour.xml b/opponents/caulifla/behaviour.xml
index 532df05257eeb853e4c88df69d9d8cd25e9196f1..9e0c373d7e8795e190b84692a7adeada0ca34783 100644
--- a/opponents/caulifla/behaviour.xml
+++ b/opponents/caulifla/behaviour.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!--This file was machine generated using the Character Editor v5.0 at 4:39:06 AM on July 31, 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 v5.0 at 5:40:08 PM on August 03, 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>v5.0</version>
<first>Caulifla</first>
@@ -63,20 +63,16 @@
<sprite id="Lighting3" delay="0.09999999" z="4" src="caulifla/Lighting.png" x="-249" y="718" scalex="0.5" scaley="0.7" alpha="0" rotation="49" />
<sprite id="Finished2" src="caulifla/7-Finished2.png" x="0" y="0" />
<sprite id="Finished1" src="caulifla/7-Finished1.png" x="0" y="0" />
- <directive type="animation" id="Aura1" ease="linear">
- <keyframe time="0" src="caulifla/Super_Saiyan_Aura.png" />
- <keyframe time="0.9" src="caulifla/Super_Saiyan_Aura.png" />
- <keyframe time="1.75" src="caulifla/Super_Saiyan_Aura.png" />
- <keyframe time="3.12" src="caulifla/Super_Saiyan_Aura.png" />
- </directive>
- <directive type="animation" id="Aura1">
- <keyframe time="0.25" x="0" />
- <keyframe time="0.9" x="0" />
- <keyframe time="1.12" x="0" />
- <keyframe time="1.75" x="0" />
- <keyframe time="2.12" x="0" />
- <keyframe time="3.12" x="0" />
- <keyframe time="3.38" x="0" />
+ <directive type="animation" id="Aura1" delay="0.25" ease="smooth" interpolation="linear">
+ <keyframe time="0" x="0" alpha="100" />
+ <keyframe time="0.65" x="0" />
+ <keyframe time="0.87" x="0" />
+ <keyframe time="1.5" x="0" />
+ <keyframe time="1.87" x="0" />
+ <keyframe time="2.25" alpha="100" />
+ <keyframe time="2.63" alpha="70" />
+ <keyframe time="2.87" x="0" alpha="30" />
+ <keyframe time="3.13" x="0" alpha="0" />
</directive>
<directive type="animation" id="Aura1" ease="linear" interpolation="linear">
<keyframe time="0" y="210" scalex="1.2" scaley="1" />
@@ -94,14 +90,7 @@
<keyframe time="3.12" y="210" scalex="1.2" scaley="1" />
<keyframe time="3.38" y="210" scalex="1.1" scaley="0.7" />
</directive>
- <directive type="animation" id="Aura1" interpolation="linear">
- <keyframe time="0.25" alpha="100" />
- <keyframe time="2.5" alpha="100" />
- <keyframe time="2.88" alpha="70" />
- <keyframe time="3.12" alpha="30" />
- <keyframe time="3.38" alpha="0" />
- </directive>
- <directive type="animation" id="Aura2" ease="linear">
+ <directive type="animation" id="Aura1" ease="linear" interpolation="none">
<keyframe time="0" src="caulifla/Super_Saiyan_Aura.png" />
<keyframe time="0.9" src="caulifla/Super_Saiyan_Aura.png" />
<keyframe time="1.75" src="caulifla/Super_Saiyan_Aura.png" />
@@ -123,88 +112,61 @@
<keyframe time="3.12" x="0" y="210" scalex="1" scaley="0.9" alpha="30" />
<keyframe time="3.38" x="0" y="210" scalex="1.3" scaley="0.7" alpha="0" />
</directive>
- <directive type="animation" id="Wave1">
- <keyframe time="0" src="caulifla/Wave.png" />
- <keyframe time="1.12" src="caulifla/Wave.png" />
- <keyframe time="2.38" src="caulifla/Wave.png" />
+ <directive type="animation" id="Aura2" ease="linear" interpolation="none">
+ <keyframe time="0" src="caulifla/Super_Saiyan_Aura.png" />
+ <keyframe time="0.9" src="caulifla/Super_Saiyan_Aura.png" />
+ <keyframe time="1.75" src="caulifla/Super_Saiyan_Aura.png" />
+ <keyframe time="3.12" src="caulifla/Super_Saiyan_Aura.png" />
</directive>
<directive type="animation" id="Wave1" ease="linear" interpolation="linear">
- <keyframe time="0" x="243" y="1054" scalex="1.37" scaley="0.16" />
- <keyframe time="0.38" x="245" y="454" scalex="1.3" scaley="0.9" />
- <keyframe time="0.69" x="176" y="300" scalex="1.7" scaley="0.1" />
- <keyframe time="1.12" x="243" y="1054" scalex="1.37" scaley="0.16" />
- <keyframe time="1.5" x="245" y="454" scalex="1.3" scaley="0.9" />
- <keyframe time="1.88" x="176" y="300" scalex="1.7" scaley="0.1" />
- <keyframe time="2.38" x="243" y="1054" scalex="1.37" scaley="0.16" />
- <keyframe time="3" x="245" y="454" scalex="1.3" scaley="0.9" />
- <keyframe time="3.62" x="176" y="300" scalex="1.7" scaley="0.1" />
- </directive>
- <directive type="animation" id="Wave1" interpolation="linear">
- <keyframe time="0" alpha="30" rotation="17" />
- <keyframe time="0.38" alpha="100" rotation="17" />
- <keyframe time="0.69" alpha="30" rotation="17" />
- <keyframe time="1.12" alpha="30" rotation="17" />
- <keyframe time="1.5" alpha="100" rotation="17" />
- <keyframe time="1.88" alpha="30" rotation="17" />
- <keyframe time="2.38" alpha="30" rotation="17" />
- <keyframe time="3" alpha="100" rotation="17" />
- <keyframe time="3.62" alpha="0" rotation="17" />
+ <keyframe time="0" x="243" y="1054" scalex="1.37" scaley="0.16" alpha="30" rotation="17" />
+ <keyframe time="0.38" x="245" y="454" scalex="1.3" scaley="0.9" alpha="100" rotation="17" />
+ <keyframe time="0.69" x="176" y="300" scalex="1.7" scaley="0.1" alpha="30" rotation="17" />
+ <keyframe time="1.12" x="243" y="1054" scalex="1.37" scaley="0.16" alpha="30" rotation="17" />
+ <keyframe time="1.5" x="245" y="454" scalex="1.3" scaley="0.9" alpha="100" rotation="17" />
+ <keyframe time="1.88" x="176" y="300" scalex="1.7" scaley="0.1" alpha="30" rotation="17" />
+ <keyframe time="2.38" x="243" y="1054" scalex="1.37" scaley="0.16" alpha="30" rotation="17" />
+ <keyframe time="3" x="245" y="454" scalex="1.3" scaley="0.9" alpha="100" rotation="17" />
+ <keyframe time="3.62" x="176" y="300" scalex="1.7" scaley="0.1" alpha="0" rotation="17" />
</directive>
- <directive type="animation" id="Wave2">
+ <directive type="animation" id="Wave1" ease="linear" interpolation="none">
<keyframe time="0" src="caulifla/Wave.png" />
<keyframe time="1.12" src="caulifla/Wave.png" />
<keyframe time="2.38" src="caulifla/Wave.png" />
</directive>
<directive type="animation" id="Wave2" ease="linear" interpolation="linear">
- <keyframe time="0" x="-243" y="1054" scalex="1.37" scaley="0.16" />
- <keyframe time="0.38" x="-245" y="454" scalex="1.3" scaley="0.9" />
- <keyframe time="0.69" x="-176" y="300" scalex="1.7" scaley="0.1" />
- <keyframe time="1.12" x="-243" y="1054" scalex="1.37" scaley="0.16" />
- <keyframe time="1.5" x="-245" y="454" scalex="1.3" scaley="0.9" />
- <keyframe time="1.88" x="-176" y="300" scalex="1.7" scaley="0.1" />
- <keyframe time="2.38" x="-243" y="1054" scalex="1.37" scaley="0.16" />
- <keyframe time="3" x="-245" y="454" scalex="1.3" scaley="0.9" />
- <keyframe time="3.62" x="-176" y="300" scalex="1.7" scaley="0.1" />
- </directive>
- <directive type="animation" id="Wave2" interpolation="linear">
- <keyframe time="0" alpha="30" rotation="-17" />
- <keyframe time="0.38" alpha="100" rotation="-17" />
- <keyframe time="0.69" alpha="30" rotation="-17" />
- <keyframe time="1.12" alpha="30" rotation="-17" />
- <keyframe time="1.5" alpha="100" rotation="-17" />
- <keyframe time="1.88" alpha="30" rotation="-17" />
- <keyframe time="2.38" alpha="30" rotation="-17" />
- <keyframe time="3" alpha="100" rotation="-17" />
- <keyframe time="3.62" alpha="0" rotation="-17" />
+ <keyframe time="0" x="-243" y="1054" scalex="1.37" scaley="0.16" alpha="30" rotation="-17" />
+ <keyframe time="0.38" x="-245" y="454" scalex="1.3" scaley="0.9" alpha="100" rotation="-17" />
+ <keyframe time="0.69" x="-176" y="300" scalex="1.7" scaley="0.1" alpha="30" rotation="-17" />
+ <keyframe time="1.12" x="-243" y="1054" scalex="1.37" scaley="0.16" alpha="30" rotation="-17" />
+ <keyframe time="1.5" x="-245" y="454" scalex="1.3" scaley="0.9" alpha="100" rotation="-17" />
+ <keyframe time="1.88" x="-176" y="300" scalex="1.7" scaley="0.1" alpha="30" rotation="-17" />
+ <keyframe time="2.38" x="-243" y="1054" scalex="1.37" scaley="0.16" alpha="30" rotation="-17" />
+ <keyframe time="3" x="-245" y="454" scalex="1.3" scaley="0.9" alpha="100" rotation="-17" />
+ <keyframe time="3.62" x="-176" y="300" scalex="1.7" scaley="0.1" alpha="0" rotation="-17" />
</directive>
- <directive type="animation" id="Wave3">
+ <directive type="animation" id="Wave2" ease="linear" interpolation="none">
<keyframe time="0" src="caulifla/Wave.png" />
<keyframe time="1.12" src="caulifla/Wave.png" />
<keyframe time="2.38" src="caulifla/Wave.png" />
</directive>
<directive type="animation" id="Wave3" ease="linear" interpolation="linear">
- <keyframe time="0" x="-6" y="1054" scalex="1.37" scaley="0.16" />
- <keyframe time="0.38" x="-6" y="454" scalex="2" scaley="0.9" />
- <keyframe time="0.69" x="-6" y="300" scalex="1.7" scaley="0.1" />
- <keyframe time="1.12" x="-6" y="1054" scalex="1.37" scaley="0.16" />
- <keyframe time="1.5" x="-6" y="454" scalex="2" scaley="0.9" />
- <keyframe time="1.88" x="-6" y="300" scalex="1.7" scaley="0.1" />
- <keyframe time="2.38" x="-6" y="1054" scalex="1.37" scaley="0.16" />
- <keyframe time="3" x="-6" y="454" scalex="2" scaley="0.9" />
- <keyframe time="3.62" x="-6" y="300" scalex="1.7" scaley="0.1" />
+ <keyframe time="0" x="-6" y="1054" scalex="1.37" scaley="0.16" alpha="30" rotation="0" />
+ <keyframe time="0.38" x="-6" y="454" scalex="2" scaley="0.9" alpha="100" rotation="0" />
+ <keyframe time="0.69" x="-6" y="300" scalex="1.7" scaley="0.1" alpha="30" rotation="0" />
+ <keyframe time="1.12" x="-6" y="1054" scalex="1.37" scaley="0.16" alpha="30" rotation="0" />
+ <keyframe time="1.5" x="-6" y="454" scalex="2" scaley="0.9" alpha="100" rotation="0" />
+ <keyframe time="1.88" x="-6" y="300" scalex="1.7" scaley="0.1" alpha="30" rotation="0" />
+ <keyframe time="2.38" x="-6" y="1054" scalex="1.37" scaley="0.16" alpha="30" rotation="0" />
+ <keyframe time="3" x="-6" y="454" scalex="2" scaley="0.9" alpha="100" rotation="0" />
+ <keyframe time="3.62" x="-6" y="300" scalex="1.7" scaley="0.1" alpha="0" rotation="0" />
</directive>
- <directive type="animation" id="Wave3" interpolation="linear">
- <keyframe time="0" alpha="30" rotation="0" />
- <keyframe time="0.38" alpha="100" rotation="0" />
- <keyframe time="0.69" alpha="30" rotation="0" />
- <keyframe time="1.12" alpha="30" rotation="0" />
- <keyframe time="1.5" alpha="100" rotation="0" />
- <keyframe time="1.88" alpha="30" rotation="0" />
- <keyframe time="2.38" alpha="30" rotation="0" />
- <keyframe time="3" alpha="100" rotation="0" />
- <keyframe time="3.62" alpha="0" rotation="0" />
+ <directive type="animation" id="Wave3" ease="linear" interpolation="none">
+ <keyframe time="0" src="caulifla/Wave.png" />
+ <keyframe time="1.12" src="caulifla/Wave.png" />
+ <keyframe time="2.38" src="caulifla/Wave.png" />
</directive>
- <directive type="animation" id="Light2" interpolation="linear">
+ <directive type="animation" id="Light2" ease="linear" interpolation="linear">
<keyframe time="0" x="0" y="775" scalex="1" scaley="1" alpha="100" />
<keyframe time="1" scalex="1" scaley="1" alpha="100" />
<keyframe time="2" scalex="0.2" scaley="0.2" alpha="100" />
@@ -238,10 +200,9 @@
<keyframe time="1.25" x="-249" y="718" scalex="0.5" scaley="0.7" alpha="0" rotation="49" />
<keyframe time="1.4" alpha="0" />
</directive>
- <directive type="animation" id="Finished1" interpolation="linear">
- <keyframe time="0" x="0" y="0" />
- <keyframe time="3.25" alpha="100" />
- <keyframe time="4.5" alpha="0" />
+ <directive type="animation" id="Finished1" delay="3.25" ease="smooth" interpolation="linear">
+ <keyframe time="0" alpha="100" />
+ <keyframe time="1.25" alpha="0" />
</directive>
</pose>
<pose id="Finishing">
@@ -817,13 +778,17 @@
<case tag="okay_hand" timeInStage="3">
<state img="0-Combat.png">Alright, I'm three for three. Let's keep this streak rolling.</state>
<state img="0-Distracted.png">Wait, I'm three for three now, yeah? Sounds about par for the course.</state>
- <state img="0-Bored.png">Hey, they sell drinks here dealer? Not until <i>after!?</i> Ugh, lame!</state>
+ <state img="0-Combat.png">We gonna grab some food after this? Heard that Earth grub is some of the finest in all the universes. Gotta be getting my hands on some of that!</state>
+ <state img="0-Laughing2.png">I've heard that Earth food is good. Like, <i>reaaal</i> good. So if anyone's got something they'd recommend, I'm all ears!</state>
+ <state img="0-Distracted.png">So hey, are we still in the Sixth universe? Or we in the Seventh right now? There being two Earths gets confusing sometimes.</state>
+ <state img="0-Distracted.png">Hey, which Earth are we playing on right now? I overheard Champa saying that there's two of them. Wanna know if I'm in my home universe or not.</state>
</case>
<case tag="okay_hand" timeInStage="6">
<state img="0-Smug.png">I'm building a real nice streak here.</state>
<state img="0-Smug.png">Damn good combo I'm building right here.</state>
<state img="0-Confident.png">Kinda nice to play in a competition like this. Y'know, one where the lives of my friends aren't all on the line.</state>
<state img="0-Happy.png">Ever wanna hear a funny story, ask about a guy named Dr. Rota. I've still got no idea what</state>
+ <state img="0-Bored.png">Hey, they sell drinks here dealer? Not until <i>after!?</i> Ugh, lame!</state>
</case>
<case tag="bad_hand">
<state img="0-Bored.png">Well...it is what it is.</state>
@@ -895,9 +860,10 @@
<state img="0-Bored.png">So, start of your week is it down here on Earth? Don't ya got something better to do than playing this?</state>
<state img="0-Distracted.png">So, "Monday" huh? Kinda weird that you even have weeks here. What's with all the universe knowing what weeks, years and all that crap is anyway?</state>
</case>
- <case tag="hand" totalRounds="2" notSaidMarker="Sixth_Universe" priority="35">
- <state img="0-Distracted.png" marker="Sixth_Universe">So hey, are we still in the Sixth universe? Or we in the Seventh right now? There being two Earths gets confusing sometimes.</state>
- <state img="0-Distracted.png" marker="Sixth_Universe">Hey, which Earth are we playing on right now? I overheard Champa saying that there's two of them. Wanna know if I'm in my home universe or not.</state>
+ <case tag="must_strip" alsoPlaying="natsuki">
+ <state img="0-Distracted.png">A dragon what now? Cosplay? I don't know what one of them is, girlie.</state>
+ <state img="0-Bored.png">What are you babbling about dragon balls for? You wanna make a wish or something, get in line. I've got stuff I want to, you're just gonna have to wait.</state>
+ <state img="0-Combat.png">What? I ain't playing around here, girlie. I came to win!</state>
</case>
<case tag="must_strip_winning">
<state img="0-Bored.png">Seems I'm ahead of the pack at least.</state>
@@ -950,6 +916,16 @@
<state img="0-Stripping.png">Y'know these are actually super-stretchy, real easy to get off. Pretty damn comfortable to.</state>
<state img="0-Stripping.png">Like 'em? Made of the same stuff Saiyans make body armor out of. Won't be scratching these up anytime soon.</state>
</case>
+ <case tag="stripping" alsoPlaying="futaba">
+ <state img="0-Stripping.png">Yup! I'm a Sadalan gal, born and raised! And one of the best fighters my unverse has to brag about.</state>
+ <state img="0-Stripping.png">You betcha! Dunno why you're talking about vegetables though, Saiyan names don't sound anything like that.</state>
+ <state img="0-Stripping.png">Saiyan as the day I was born! And I wouldn't have it any other way.</state>
+ </case>
+ <case tag="stripping" alsoPlaying="nami">
+ <state img="0-Stripping.png">Lady, I don't know what either of those things are, but there ain't no fruit out there that'll give ya hair as fine as mine!</state>
+ <state img="0-Stripping.png">The hell's a hedgehog? And should I be chill or pissed that you're comparing me to one of these things?</state>
+ <state img="0-Stripping.png">Devil's fruit huh? Don't know about those, lady. But if they're tasty, I woudn't mind trying one. Been meaning to get me some of that Earth food I've heard so much about.</state>
+ </case>
<case tag="male_must_strip">
<state img="0-Victory.png">Oh yeah, ya like that? That's just how Caulifla rolls!</state>
<state img="0-Smug.png">Mistakes like that will cost ya. Your clothes mostly, heh heh.</state>
@@ -969,9 +945,9 @@
</case>
<case tag="male_must_strip" target="jotaro" targetStage="0">
<state img="0-Smug.png">Well hello there, big, tall and mysterious. Got any surprises in store for little old me?</state>
- <state img="0-Distracted.png">You've been pretty quiet so far. I ain't complaining, just stating a fact.</state>
+ <state img="0-Distracted.png">You've been pretty quiet since ya got here. I ain't complaining about it, just stating a fact.</state>
<state img="0-Smug.png">Hmm. You kinda remind me of someone. Ain't gonna tell ya who though.</state>
- <state img="0-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy about him.</state>
+ <state img="0-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy as he does.</state>
</case>
<case tag="male_must_strip" target="jotaro" targetStage="1">
<state img="0-Annoyed.png">. . .</state>
@@ -1031,11 +1007,11 @@
<state img="0-Distracted.png">Pointy ears and a...robust constitution. You remind me of the Supreme Kai.</state>
</case>
<case tag="female_must_strip" target="florina" targetStage="0">
- <state img="0-Distracted.png">Hey. You seem nervous. Like, really, <really> nervous.</state>
+ <state img="0-Distracted.png">You seem nervous. Like, really, <really> nervous.</state>
<state img="0-Confident.png">You've gotten yourself worked up over something. Is it the game, or something else that's bothering ya?</state>
<state img="0-Happy.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
<state img="0-Confident.png">Hmm. Something's eating you up. Whatever's going through you mind right now, trust me, it ain't as bad as you think.</state>
- <state img="0-Happy.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
+ <state img="0-Happy.png">Hey, girlie. It's okay, y'know? Ya don't have to fret about this sorta thing.</state>
</case>
<case tag="female_must_strip" target="florina" targetStage="1">
<state img="0-Excited.png">Alright, let's do this again. Come on, I know you've got this, you've <i>totally</i> got this one!</state>
@@ -1132,6 +1108,11 @@
<state img="0-Annoyed.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
<state img="0-Angry.png">Oh I know your type, ~name~. It's all sunshine and rainbows and obnoxiously long transformations. You really think that crap has any place on the battlefield?</state>
</case>
+ <case tag="female_must_strip" target="streaming-chan" targetStage="0" targetSayingMarker="viewers">
+ <state img="0-Annoyed.png">So...what, I'm on some kinda broadcast right now? Not entirely sure how I feel about that.</state>
+ <state img="0-Stretching.png">Hmm. One one hand, kinda like the thought of having a camera on me. What I don't like is the idea of this stuff ending up on Sadala somehow.</state>
+ <state img="0-Annoyed.png">Hey, is this channel thingy of yours showing solely on Earth? Last thing I need is the criminal underbelly of Sadala catching this stuff. Gonna take a <i>lot</i> of punching people before I hear the end of this.</state>
+ </case>
<case tag="tie">
<state img="0-Shocked.png">Wait...you've got...am I honestly seeing that right?</state>
<state img="0-Shocked.png">Say what? How the hell'd that happen?</state>
@@ -1161,7 +1142,7 @@
<case tag="male_removing_accessory" target="jotaro" targetStage="0">
<state img="0-Shocked.png">What the hell!?</state>
<state img="0-Shocked.png">Woah, jeez!</state>
- <state img="0-Thinking.png">Wait, did I just miss something? That almost looked like Hit's...</state>
+ <state img="0-Angry.png">Wait, did I just miss something? That almost looked like...no...</state>
</case>
<case tag="male_removing_accessory" target="jotaro" targetStage="1">
<state img="0-Angry.png">. . .</state>
@@ -1194,8 +1175,8 @@
<state img="0-Distracted.png">Yeah. That was about as dull as I was expecting. You tried at least, buddy.</state>
</case>
<case tag="male_removed_accessory" target="jotaro" targetStage="1">
- <state img="0-Angry.png">Wait...did...okay, buddy. I'm gonna have my eye <i>real</i> close on you. I got an idea about you that'll be pretty crazy if it turns out true.</state>
- <state img="0-Angry.png">You...did you just...alright, I have a hunch about you Jotaro. And I'm gonna be watching <i>real</i> close from here on out.</state>
+ <state img="0-Annoyed.png">Okay, buddy. I'm gonna have my eye <i>real</i> close on you. I got an idea about you that'll be pretty crazy if it turns out true.</state>
+ <state img="0-Annoyed.png">You...did you just...alright, I have a hunch about you Jotaro. And I'm gonna be watching <i>real</i> close from here on out.</state>
</case>
<case tag="male_removed_accessory" target="jotaro" targetStage="2">
<state img="0-Laughing2.png">Haha...ha, haa, haa! Oh I'm <i>dead on</i>! You're using an honest to crap time-skip, ain't ya buddy? That's incredible!</state>
@@ -1304,6 +1285,11 @@
<state img="0-Bored.png">Hmm. Was that one more of a pop or a pow? Ugh, that sounds like something Goku would say. Or one of the Zenos.</state>
<state img="0-Bored.png">Noisiest game of strip poker I've ever played.</state>
</case>
+ <case tag="female_removing_accessory" target="streaming-chan" targetStage="0">
+ <state img="0-Angry.png">So. If this <i>is</i> being broadcast galactically? Your ass is gonna be grass, ya hear me?</state>
+ <state img="0-Combat.png">Let's just try to keep this stuff local. To <i>Earth</i>. Else I might get kinda upset about that, if ya feel me.</state>
+ <state img="0-Happy.png">Heh. So, this crap's live is it? Well then, to all y'all pervs at home? Must feel pretty swell, knowing you've hit the damn jackpot over here!</state>
+ </case>
<case tag="female_removing_accessory">
<test expr="~clothing.position~" value="neck" />
<state img="0-Thinking.png"><i>(Hmm. Could be worth something maybe? Try and see if I can bag her ~clothing~ when nobody's looking. Not like they'd be able to stop me anyhow.)</i></state>
@@ -1335,7 +1321,7 @@
</case>
<case tag="female_removed_accessory" target="leggy" targetStage="1">
<state img="0-Laughing.png">Well, ya never. You could be some kinda genius at this for all I know.</state>
- <state img="0-Thinking.png">Stranger things have happened though Sometimes the most harmless looking people are actually the most dangerous.</state>
+ <state img="0-Thinking.png">Sometimes the most harmless looking people are actually the most dangerous. I better be keeping my eye on ya all the same.</state>
<state img="0-Combat.png">Still. I'm gonna keep my wits about me. Never know what an opponent has in store for ya.</state>
</case>
<case tag="female_removed_accessory" target="marinette" targetStage="1">
@@ -1344,7 +1330,7 @@
</case>
<case tag="female_removed_accessory" target="meia" targetStage="1">
<state img="0-Distracted.png">Oh, uhh, sentimental or something is it? I ain't gonna judge. They're just kinda common where I'm from is all.</state>
- <state img="0-Stretching.png">You seem kinda precious about it, whatever the reason for that is. Don't worry lady, I won't pry. Not if you don't want me to.</state>
+ <state img="0-Confident.png">You seem kinda precious about it, whatever the reason for that is. Don't worry lady, I won't pry. Not if you don't want me to.</state>
</case>
<case tag="female_removed_accessory" target="moon" targetStage="2">
<state img="0-Bored.png">Jeez. You're completely gaga, ain't ya.</state>
@@ -1434,8 +1420,8 @@
<state img="0-Combat.png">Hmm. Maybe you're for real...nah. Soon as I start thinking that you're gonna "switch back" and be all like, haha, told ya so. I'm harder to fool than that I'm afraid.</state>
</case>
<case tag="female_removing_minor" id="0-10" target="leggy" targetStage="2">
- <state img="0-Shocked.png">Hey, wait, Those are <i>shears</i>!? Wow, you've actually surprised me with that move.</state>
- <state img="0-Thinking.png">Wait. Shaving? Oooh! Wait, I get it. You're gonna count that as a play.</state>
+ <state img="0-Shocked.png">Wait, those are <i>shears</i> you've got there!? Wow, you've actually surprised me with that move.</state>
+ <state img="0-Thinking.png">Wait. Shaving? Oooh! Right, I get it. You're gonna count that as a play.</state>
<state img="0-Bored.png">Oh. And here I thought I had ya knocked out. Seems you ain't ready to quit just yet.</state>
</case>
<case tag="female_removing_minor" target="meia" targetStage="1">
@@ -1478,7 +1464,7 @@
<state img="0-Confident.png">Well. Sorry 'bout that? Heh, is that what you wanted me to say right now? You want a kiss and a cuddle as well? Sorry, ain't getting me on board with this performance, lady.</state>
</case>
<case tag="female_removed_minor" target="leggy" targetStage="3">
- <state img="0-Happy.png">Hey, y'know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
+ <state img="0-Happy.png">Know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
<state img="0-Confident.png">Well ya won't catch me shaving myself to keep in the game. So fair enough, that's one gutsy move to make right there.</state>
<state img="0-Bored.png">Don't like to admit it, but ya had me fooled there. I thought I'd beaten ya already.</state>
<state img="0-Laughing.png">Heh. So ya had some tricks to play after all. Seems like you've got half a brain in that head of yours at least.</state>
@@ -1673,7 +1659,7 @@
<state img="0-Horny.png">I'll admit it, this is a bit weird.</state>
<state img="0-Laughing.png">Well those are balls. Bit more <i>wobbly</i> than the sort I'm familiar with, heh.</state>
<state img="0-Horny.png"><i>(Well. Those ain't the dragon-summoning kind)</i></state>
- <state img="0-Embarassed.png">I'm sure you could sire a few heirs with that thing.</state>
+ <state img="0-Distracted.png">I'm sure you could sire a few heirs with that thing.</state>
<state img="0-Smug.png">Hmm. Looks like something's been rising over there pretty good.</state>
</case>
<case tag="male_large_crotch_is_visible">
@@ -2011,13 +1997,17 @@
<case tag="okay_hand" timeInStage="3">
<state img="1-Combat.png">Alright, I'm three for three. Let's keep this streak rolling.</state>
<state img="1-Distracted.png">Wait, I'm three for three now, yeah? Sounds about par for the course.</state>
- <state img="1-Bored.png">Hey, they sell drinks here dealer? Not until <i>after!?</i> Ugh, lame!</state>
+ <state img="1-Combat.png">We gonna grab some food after this? Heard that Earth grub is some of the finest in all the universes. Gotta be getting my hands on some of that!</state>
+ <state img="1-Laughing2.png">I've heard that Earth food is good. Like, <i>reaaal</i> good. So if anyone's got something they'd recommend, I'm all ears!</state>
+ <state img="1-Distracted.png">So hey, are we still in the Sixth universe? Or we in the Seventh right now? There being two Earths gets confusing sometimes.</state>
+ <state img="1-Distracted.png">Hey, which Earth are we playing on right now? I overheard Champa saying that there's two of them. Wanna know if I'm in my home universe or not.</state>
</case>
<case tag="okay_hand" timeInStage="6">
<state img="1-Smug.png">I'm building a real nice streak here.</state>
<state img="1-Smug.png">Damn good combo I'm building right here.</state>
<state img="1-Confident.png">Kinda nice to play in a competition like this. Y'know, one where the lives of my friends aren't all on the line.</state>
<state img="1-Happy.png">Ever wanna hear a funny story, ask about a guy named Dr. Rota. I've still got no idea what</state>
+ <state img="1-Bored.png">Hey, they sell drinks here dealer? Not until <i>after!?</i> Ugh, lame!</state>
</case>
<case tag="bad_hand">
<state img="1-Bored.png">Well...it is what it is.</state>
@@ -2057,9 +2047,15 @@
<state img="1-Laughing.png">Hey, look at that. I got a pair of Corrins! Haha.</state>
<state img="1-Distracted.png">So, you're both called Corrin? That's kinda funny. I'd have guessed you were twins if ya hadn't said anything.</state>
</case>
- <case tag="hand" totalRounds="2" notSaidMarker="Sixth_Universe" priority="35">
- <state img="1-Distracted.png" marker="Sixth_Universe">So hey, are we still in the Sixth universe? Or we in the Seventh right now? There being two Earths gets confusing sometimes.</state>
- <state img="1-Distracted.png" marker="Sixth_Universe">Hey, which Earth are we playing on right now? I overheard Champa saying that there's two of them. Wanna know if I'm in my home universe or not.</state>
+ <case tag="must_strip" alsoPlaying="mahiru">
+ <state img="1-Meditating.png">Hey, Mahiru. That takes pictures, right? You're gonna want to take some in just a second.</state>
+ <state img="1-Meditating.png">Hey, Mahiru. What did you call that thing again, a camera? You're gonna want to have it ready for this.</state>
+ <state img="1-Meditating.png">Get that freaking camera of yours ready, girly. You're gonna want to take some pictures of this.</state>
+ </case>
+ <case tag="must_strip" alsoPlaying="streaming-chan">
+ <state img="1-Meditating.png">So, people are watching this right now? Heh, well they ain't gonna want to miss this next bit.</state>
+ <state img="1-Meditating.png">Streamer girl you better have your camera pointed this way. Because like my battle power, your rating are about to go through the roof.</state>
+ <state img="1-Meditating.png">Hey, streamer girl. The footage your recording, it's gonna get some crazy hits once I pull this next trick off.</state>
</case>
<case tag="must_strip_winning">
<state img="1-Meditating.png">I just got an idea. And trust me, you're gonna love this.</state>
@@ -2084,6 +2080,11 @@
<state img="1-Angry.png" marker="lost_twice">Piss off! No damn way I've lost two rounds back to back. The hell's going on here?</state>
<state img="1-Annoyed.png" marker="lost_twice">Wait, ain't that twice? That's <i>twice</i> now back to back?! Dammit!</state>
</case>
+ <case tag="must_strip_normal" consecutiveLosses="2" notSaidMarker="lost_twice" priority="71">
+ <state img="1-Meditating.png" marker="lost_twice">Dammit, you've got me rocked. I need to do something quick if I'm gonna turn this around!</state>
+ <state img="1-Meditating.png" marker="lost_twice">Again?! Alright, Plan B. Going Super Saiyan!</state>
+ <state img="1-Meditating.png" marker="lost_twice"><i>(Crap! Again?! If I don't up my game here I could be in serious trouble!)</i></state>
+ </case>
<case tag="must_strip_losing">
<state img="1-Meditating.png">Getting a little antsy. And I know just what to do about it.</state>
<state img="1-Meditating.png">You might be a few hands ahead of me. But I've still got an ace yet to play...</state>
@@ -2112,6 +2113,11 @@
<state img="1-Stripped.png">So was that skill on your part, or just a lucky hit? Guess we're gonna find out.</state>
<state img="1-Stripped.png">Think I'm scared? Yeah, scared of my awesome and amazing potential perhaps.</state>
</case>
+ <case tag="stripped" alsoPlaying="futaba">
+ <state img="1-Stripped.png">Heh. Higher than a million little ginger girls like you put together, that's for sure.</state>
+ <state img="1-Stripped.png">Think ya need to re-check your scouter, sweetheart. My spit's probably got a higher power level than just nine thousand.</state>
+ <state img="1-Stripped.png">Heh. Well you wouldn't be the first person to geek out over meeting a Saiyan. I'll take all the nonsense coming outta your mouth as a compliment.</state>
+ </case>
<case tag="stripped" alsoPlaying="nugi-chan" alsoPlayingStage="0-2" totalExposed="0" totalRounds="4-">
<state img="1-Stripped.png">You're telling me. Let's hope we can amp the game up from here on out.</state>
<state img="1-Stripped.png">Ah, don't worry your pretty little self about it. I'm sure things'll pick up at some point.</state>
@@ -2136,9 +2142,9 @@
</case>
<case tag="male_must_strip" target="jotaro" targetStage="0">
<state img="1-Smug.png">Well hello there, big, tall and mysterious. Got any surprises in store for little old me?</state>
- <state img="1-Distracted.png">You've been pretty quiet so far. I ain't complaining, just stating a fact.</state>
+ <state img="1-Distracted.png">You've been pretty quiet since ya got here. I ain't complaining about it, just stating a fact.</state>
<state img="1-Smug.png">Hmm. You kinda remind me of someone. Ain't gonna tell ya who though.</state>
- <state img="1-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy about him.</state>
+ <state img="1-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy as he does.</state>
</case>
<case tag="male_must_strip" target="jotaro" targetStage="1">
<state img="1-Annoyed.png">. . .</state>
@@ -2198,11 +2204,11 @@
<state img="1-Distracted.png">Pointy ears and a...robust constitution. You remind me of the Supreme Kai.</state>
</case>
<case tag="female_must_strip" target="florina" targetStage="0">
- <state img="1-Distracted.png">Hey. You seem nervous. Like, really, <really> nervous.</state>
+ <state img="1-Distracted.png">You seem nervous. Like, really, <really> nervous.</state>
<state img="1-Confident.png">You've gotten yourself worked up over something. Is it the game, or something else that's bothering ya?</state>
<state img="1-Happy.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
<state img="1-Confident.png">Hmm. Something's eating you up. Whatever's going through you mind right now, trust me, it ain't as bad as you think.</state>
- <state img="1-Happy.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
+ <state img="1-Happy.png">Hey, girlie. It's okay, y'know? Ya don't have to fret about this sorta thing.</state>
</case>
<case tag="female_must_strip" target="florina" targetStage="1">
<state img="1-Excited.png">Alright, let's do this again. Come on, I know you've got this, you've <i>totally</i> got this one!</state>
@@ -2299,6 +2305,11 @@
<state img="1-Annoyed.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
<state img="1-Angry.png">Oh I know your type, ~name~. It's all sunshine and rainbows and obnoxiously long transformations. You really think that crap has any place on the battlefield?</state>
</case>
+ <case tag="female_must_strip" target="streaming-chan" targetStage="0" targetSayingMarker="viewers">
+ <state img="1-Annoyed.png">So...what, I'm on some kinda broadcast right now? Not entirely sure how I feel about that.</state>
+ <state img="1-Stretching.png">Hmm. One one hand, kinda like the thought of having a camera on me. What I don't like is the idea of this stuff ending up on Sadala somehow.</state>
+ <state img="1-Annoyed.png">Hey, is this channel thingy of yours showing solely on Earth? Last thing I need is the criminal underbelly of Sadala catching this stuff. Gonna take a <i>lot</i> of punching people before I hear the end of this.</state>
+ </case>
<case tag="tie">
<state img="1-Shocked.png">Wait...you've got...am I honestly seeing that right?</state>
<state img="1-Shocked.png">Say what? How the hell'd that happen?</state>
@@ -2328,7 +2339,7 @@
<case tag="male_removing_accessory" target="jotaro" targetStage="0">
<state img="1-Shocked.png">What the hell!?</state>
<state img="1-Shocked.png">Woah, jeez!</state>
- <state img="1-Thinking.png">Wait, did I just miss something? That almost looked like Hit's...</state>
+ <state img="1-Angry.png">Wait, did I just miss something? That almost looked like...no...</state>
</case>
<case tag="male_removing_accessory" target="jotaro" targetStage="1">
<state img="1-Angry.png">. . .</state>
@@ -2361,8 +2372,8 @@
<state img="1-Distracted.png">Yeah. That was about as dull as I was expecting. You tried at least, buddy.</state>
</case>
<case tag="male_removed_accessory" target="jotaro" targetStage="1">
- <state img="1-Angry.png">Wait...did...okay, buddy. I'm gonna have my eye <i>real</i> close on you. I got an idea about you that'll be pretty crazy if it turns out true.</state>
- <state img="1-Angry.png">You...did you just...alright, I have a hunch about you Jotaro. And I'm gonna be watching <i>real</i> close from here on out.</state>
+ <state img="1-Annoyed.png">Okay, buddy. I'm gonna have my eye <i>real</i> close on you. I got an idea about you that'll be pretty crazy if it turns out true.</state>
+ <state img="1-Annoyed.png">You...did you just...alright, I have a hunch about you Jotaro. And I'm gonna be watching <i>real</i> close from here on out.</state>
</case>
<case tag="male_removed_accessory" target="jotaro" targetStage="2">
<state img="1-Laughing2.png">Haha...ha, haa, haa! Oh I'm <i>dead on</i>! You're using an honest to crap time-skip, ain't ya buddy? That's incredible!</state>
@@ -2471,6 +2482,11 @@
<state img="1-Bored.png">Hmm. Was that one more of a pop or a pow? Ugh, that sounds like something Goku would say. Or one of the Zenos.</state>
<state img="1-Bored.png">Noisiest game of strip poker I've ever played.</state>
</case>
+ <case tag="female_removing_accessory" target="streaming-chan" targetStage="0">
+ <state img="1-Angry.png">So. If this <i>is</i> being broadcast galactically? Your ass is gonna be grass, ya hear me?</state>
+ <state img="1-Combat.png">Let's just try to keep this stuff local. To <i>Earth</i>. Else I might get kinda upset about that, if ya feel me.</state>
+ <state img="1-Happy.png">Heh. So, this crap's live is it? Well then, to all y'all pervs at home? Must feel pretty swell, knowing you've hit the damn jackpot over here!</state>
+ </case>
<case tag="female_removing_accessory">
<test expr="~clothing.position~" value="neck" />
<state img="1-Thinking.png"><i>(Hmm. Could be worth something maybe? Try and see if I can bag her ~clothing~ when nobody's looking. Not like they'd be able to stop me anyhow.)</i></state>
@@ -2502,7 +2518,7 @@
</case>
<case tag="female_removed_accessory" target="leggy" targetStage="1">
<state img="1-Laughing.png">Well, ya never. You could be some kinda genius at this for all I know.</state>
- <state img="1-Thinking.png">Stranger things have happened though Sometimes the most harmless looking people are actually the most dangerous.</state>
+ <state img="1-Thinking.png">Sometimes the most harmless looking people are actually the most dangerous. I better be keeping my eye on ya all the same.</state>
<state img="1-Combat.png">Still. I'm gonna keep my wits about me. Never know what an opponent has in store for ya.</state>
</case>
<case tag="female_removed_accessory" target="marinette" targetStage="1">
@@ -2511,7 +2527,7 @@
</case>
<case tag="female_removed_accessory" target="meia" targetStage="1">
<state img="1-Distracted.png">Oh, uhh, sentimental or something is it? I ain't gonna judge. They're just kinda common where I'm from is all.</state>
- <state img="1-Stretching.png">You seem kinda precious about it, whatever the reason for that is. Don't worry lady, I won't pry. Not if you don't want me to.</state>
+ <state img="1-Confident.png">You seem kinda precious about it, whatever the reason for that is. Don't worry lady, I won't pry. Not if you don't want me to.</state>
</case>
<case tag="female_removed_accessory" target="moon" targetStage="2">
<state img="1-Bored.png">Jeez. You're completely gaga, ain't ya.</state>
@@ -2601,8 +2617,8 @@
<state img="1-Combat.png">Hmm. Maybe you're for real...nah. Soon as I start thinking that you're gonna "switch back" and be all like, haha, told ya so. I'm harder to fool than that I'm afraid.</state>
</case>
<case tag="female_removing_minor" id="1-10" target="leggy" targetStage="2">
- <state img="1-Shocked.png">Hey, wait, Those are <i>shears</i>!? Wow, you've actually surprised me with that move.</state>
- <state img="1-Thinking.png">Wait. Shaving? Oooh! Wait, I get it. You're gonna count that as a play.</state>
+ <state img="1-Shocked.png">Wait, those are <i>shears</i> you've got there!? Wow, you've actually surprised me with that move.</state>
+ <state img="1-Thinking.png">Wait. Shaving? Oooh! Right, I get it. You're gonna count that as a play.</state>
<state img="1-Bored.png">Oh. And here I thought I had ya knocked out. Seems you ain't ready to quit just yet.</state>
</case>
<case tag="female_removing_minor" target="meia" targetStage="1">
@@ -2645,7 +2661,7 @@
<state img="1-Confident.png">Well. Sorry 'bout that? Heh, is that what you wanted me to say right now? You want a kiss and a cuddle as well? Sorry, ain't getting me on board with this performance, lady.</state>
</case>
<case tag="female_removed_minor" target="leggy" targetStage="3">
- <state img="1-Happy.png">Hey, y'know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
+ <state img="1-Happy.png">Know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
<state img="1-Confident.png">Well ya won't catch me shaving myself to keep in the game. So fair enough, that's one gutsy move to make right there.</state>
<state img="1-Bored.png">Don't like to admit it, but ya had me fooled there. I thought I'd beaten ya already.</state>
<state img="1-Laughing.png">Heh. So ya had some tricks to play after all. Seems like you've got half a brain in that head of yours at least.</state>
@@ -2840,7 +2856,7 @@
<state img="1-Horny.png">I'll admit it, this is a bit weird.</state>
<state img="1-Laughing.png">Well those are balls. Bit more <i>wobbly</i> than the sort I'm familiar with, heh.</state>
<state img="1-Horny.png"><i>(Well. Those ain't the dragon-summoning kind)</i></state>
- <state img="1-Embarassed.png">I'm sure you could sire a few heirs with that thing.</state>
+ <state img="1-Distracted.png">I'm sure you could sire a few heirs with that thing.</state>
<state img="1-Smug.png">Hmm. Looks like something's been rising over there pretty good.</state>
</case>
<case tag="male_large_crotch_is_visible">
@@ -3243,11 +3259,12 @@
<state img="custom:SSJ Rnd 1" marker="aura_fade">So. You ready? Nah, ain't no way you could be ready for all of what I am right here.</state>
<state img="custom:SSJ Rnd 1" marker="aura_fade">Alright, I'm feeling good about my chances now. Think you'll be able to tangle with a Super Saiyan?</state>
<state img="custom:SSJ Rnd 1" marker="aura_fade">Like I was saying, going Super Saiyan really sharpens up my instincts. I reckon that should apply to card playing.</state>
- <state img="custom:SSJ Rnd 1" marker="aura_fade">Super Saiyan ain't just power by the way. It really brings out my killer instincts when I transform. Means that if you're looking for mercy, you're fresh outta luck now.</state>
+ <state img="custom:SSJ Rnd 1" marker="aura_fade">Super Saiyan ain't just power by the way. It really brings out my killer instincts when I transform. Lucky you.</state>
<state img="custom:SSJ Rnd 1" marker="aura_fade">I'm just transforming for the training. Might make me play better though, guess we'll find out soon enough.</state>
<state img="custom:SSJ Rnd 1" marker="aura_fade">So. How d'ya like it? So damn strong and only getting stronger. I'll be the greatest Saiyan in all creation before ya know it!</state>
- <state img="custom:SSJ Rnd 1" marker="aura_fade">So yeah. It makes for good training, going in and out of Super Saiyan. It'll probably throw you lot off your game. Wouldn't blame ya for being afraid of me right now.</state>
+ <state img="custom:SSJ Rnd 1" marker="aura_fade">So yeah. It makes for good training, going in and out of Super Saiyan. And It'll probably throw you lot off your game. Wouldn't blame ya for being afraid of me.</state>
<state img="custom:SSJ Rnd 1" marker="aura_fade">Never stops feeling great to be a Saiyan.</state>
+ <state img="custom:SSJ Rnd 1" marker="aura_fade">Alright! I'm transformed. That means if you're looking for mercy, you're fresh outta luck now!</state>
</case>
<case tag="must_strip_winning">
<state img="2-Horny.png">Cutting it close now, but I'm still ahead of the curve.</state>
@@ -3307,6 +3324,21 @@
<state img="2-Stripping.png">Yeah, yeah. Both of 'em together. I'll play by the rules, seeing as you won that hand fair and square.</state>
<state img="2-Stripping.png">Really should've brought an earring or something. Damn little dangly-things aren't really my style.</state>
</case>
+ <case tag="stripping" alsoPlaying="akko">
+ <state img="2-Stripping.png">This stuff just comes naturally to Saiyans. It's like ya learn to walk, talk, and then flying is what's next in line.</state>
+ <state img="2-Stripping.png">If ya need some pointers Akko, I might be nice enough to show you some things afterwards. Ain't gonna do it for free though.</state>
+ <state img="2-Stripping.png">It all just kinda comes naturally to me. I guess I am pretty amazing though.</state>
+ </case>
+ <case tag="stripping" alsoPlaying="nami">
+ <state img="2-Stripping.png">Pft. "So what?" Try swatting me out the sky with that little pole of yours. Then we'll see what's up.</state>
+ <state img="2-Stripping.png">"So what", are you serious? When it starts raining energy blasts, I guess we'll find out how useful flying is.</state>
+ <state img="2-Stripping.png">You say that like you <i>can't</i> fly. Because wow, if that's true, that's pretty pathetic.</state>
+ </case>
+ <case tag="stripping" alsoPlaying="natsuki">
+ <state img="2-Stripping.png">All of planet Sadala is my gym, Nattie girl. I built my skills by showing those defence troopers who's boss, and running riot in the underground fighting circuits.</state>
+ <state img="2-Stripping.png">Yeah? I can fly. Why's that so big a deal?</state>
+ <state img="2-Stripping.png">Yeah. I get that a lot from you earth types. Seems that something as simple as flying is just a bit too much for most to wrap their heads around.</state>
+ </case>
<case tag="stripped">
<state img="custom:SSJ">If you thought picking a fight with me was a bad idea before, you've got <i>nothing</i> on what I am now!</state>
<state img="custom:SSJ">Check it out. You scared? I bet you're scared.</state>
@@ -3336,9 +3368,9 @@
</case>
<case tag="male_must_strip" target="jotaro" targetStage="0">
<state img="2-Smug.png">Well hello there, big, tall and mysterious. Got any surprises in store for little old me?</state>
- <state img="2-Distracted.png">You've been pretty quiet so far. I ain't complaining, just stating a fact.</state>
+ <state img="2-Distracted.png">You've been pretty quiet since ya got here. I ain't complaining about it, just stating a fact.</state>
<state img="2-Smug.png">Hmm. You kinda remind me of someone. Ain't gonna tell ya who though.</state>
- <state img="2-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy about him.</state>
+ <state img="2-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy as he does.</state>
</case>
<case tag="male_must_strip" target="jotaro" targetStage="1">
<state img="2-Annoyed.png">. . .</state>
@@ -3400,11 +3432,11 @@
<state img="2-Distracted.png">Pointy ears and a...robust constitution. You remind me of the Supreme Kai.</state>
</case>
<case tag="female_must_strip" target="florina" targetStage="0">
- <state img="2-Distracted.png">Hey. You seem nervous. Like, really, <really> nervous.</state>
+ <state img="2-Distracted.png">You seem nervous. Like, really, <really> nervous.</state>
<state img="2-Confident.png">You've gotten yourself worked up over something. Is it the game, or something else that's bothering ya?</state>
<state img="2-Happy.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
<state img="2-Confident.png">Hmm. Something's eating you up. Whatever's going through you mind right now, trust me, it ain't as bad as you think.</state>
- <state img="2-Happy.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
+ <state img="2-Happy.png">Hey, girlie. It's okay, y'know? Ya don't have to fret about this sorta thing.</state>
</case>
<case tag="female_must_strip" target="florina" targetStage="1">
<state img="2-Excited.png">Alright, let's do this again. Come on, I know you've got this, you've <i>totally</i> got this one!</state>
@@ -3501,6 +3533,11 @@
<state img="2-Annoyed.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
<state img="2-Angry.png">Oh I know your type, ~name~. It's all sunshine and rainbows and obnoxiously long transformations. You really think that crap has any place on the battlefield?</state>
</case>
+ <case tag="female_must_strip" target="streaming-chan" targetStage="0" targetSayingMarker="viewers">
+ <state img="2-Annoyed.png">So...what, I'm on some kinda broadcast right now? Not entirely sure how I feel about that.</state>
+ <state img="2-Stretching.png">Hmm. One one hand, kinda like the thought of having a camera on me. What I don't like is the idea of this stuff ending up on Sadala somehow.</state>
+ <state img="2-Annoyed.png">Hey, is this channel thingy of yours showing solely on Earth? Last thing I need is the criminal underbelly of Sadala catching this stuff. Gonna take a <i>lot</i> of punching people before I hear the end of this.</state>
+ </case>
<case tag="tie">
<state img="2-Shocked.png">Wait...you've got...am I honestly seeing that right?</state>
<state img="2-Shocked.png">Say what? How the hell'd that happen?</state>
@@ -3528,7 +3565,7 @@
<case tag="male_removing_accessory" target="jotaro" targetStage="0">
<state img="2-Shocked.png">What the hell!?</state>
<state img="2-Shocked.png">Woah, jeez!</state>
- <state img="2-Thinking.png">Wait, did I just miss something? That almost looked like Hit's...</state>
+ <state img="2-Angry.png">Wait, did I just miss something? That almost looked like...no...</state>
</case>
<case tag="male_removing_accessory" target="jotaro" targetStage="1">
<state img="2-Angry.png">. . .</state>
@@ -3644,6 +3681,11 @@
<state img="2-Bored.png">Hmm. Was that one more of a pop or a pow? Ugh, that sounds like something Goku would say. Or one of the Zenos.</state>
<state img="2-Bored.png">Noisiest game of strip poker I've ever played.</state>
</case>
+ <case tag="female_removing_accessory" target="streaming-chan" targetStage="0">
+ <state img="2-Angry.png">So. If this <i>is</i> being broadcast galactically? Your ass is gonna be grass, ya hear me?</state>
+ <state img="2-Combat.png">Let's just try to keep this stuff local. To <i>Earth</i>. Else I might get kinda upset about that, if ya feel me.</state>
+ <state img="2-Happy.png">Heh. So, this crap's live is it? Well then, to all y'all pervs at home? Must feel pretty swell, knowing you've hit the damn jackpot over here!</state>
+ </case>
<case tag="female_removed_accessory">
<state img="2-Embarassed.png">Ugh, I really am behind.</state>
<state img="2-Embarassed.png">I'm gonna have to turn this around, and do it fast.</state>
@@ -3667,7 +3709,7 @@
</case>
<case tag="female_removed_accessory" target="leggy" targetStage="1">
<state img="2-Laughing.png">Well, ya never. You could be some kinda genius at this for all I know.</state>
- <state img="2-Thinking.png">Stranger things have happened though Sometimes the most harmless looking people are actually the most dangerous.</state>
+ <state img="2-Thinking.png">Sometimes the most harmless looking people are actually the most dangerous. I better be keeping my eye on ya all the same.</state>
<state img="2-Combat.png">Still. I'm gonna keep my wits about me. Never know what an opponent has in store for ya.</state>
</case>
<case tag="female_removed_accessory" target="marinette" targetStage="1">
@@ -3762,8 +3804,8 @@
<state img="2-Combat.png">Hmm. Maybe you're for real...nah. Soon as I start thinking that you're gonna "switch back" and be all like, haha, told ya so. I'm harder to fool than that I'm afraid.</state>
</case>
<case tag="female_removing_minor" id="2-10" target="leggy" targetStage="2">
- <state img="2-Shocked.png">Hey, wait, Those are <i>shears</i>!? Wow, you've actually surprised me with that move.</state>
- <state img="2-Thinking.png">Wait. Shaving? Oooh! Wait, I get it. You're gonna count that as a play.</state>
+ <state img="2-Shocked.png">Wait, those are <i>shears</i> you've got there!? Wow, you've actually surprised me with that move.</state>
+ <state img="2-Thinking.png">Wait. Shaving? Oooh! Right, I get it. You're gonna count that as a play.</state>
<state img="2-Bored.png">Oh. And here I thought I had ya knocked out. Seems you ain't ready to quit just yet.</state>
</case>
<case tag="female_removing_minor" target="meia" targetStage="1">
@@ -3805,7 +3847,7 @@
<state img="2-Confident.png">Well. Sorry 'bout that? Heh, is that what you wanted me to say right now? You want a kiss and a cuddle as well? Sorry, ain't getting me on board with this performance, lady.</state>
</case>
<case tag="female_removed_minor" target="leggy" targetStage="3">
- <state img="2-Happy.png">Hey, y'know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
+ <state img="2-Happy.png">Know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
<state img="2-Confident.png">Well ya won't catch me shaving myself to keep in the game. So fair enough, that's one gutsy move to make right there.</state>
<state img="2-Bored.png">Don't like to admit it, but ya had me fooled there. I thought I'd beaten ya already.</state>
<state img="2-Laughing.png">Heh. So ya had some tricks to play after all. Seems like you've got half a brain in that head of yours at least.</state>
@@ -3842,7 +3884,7 @@
<state img="2-Laughing.png">Haha, I bet Cabba would be sweating up a storm right now. And this isn't even the worst bit for you yet!</state>
<state img="2-Confident.png">You put most species out there to shame in the looks department, and you seem like a good example of yours. I'll give ya that much.</state>
<state img="2-Happy.png">Y'know compared to most Saiyans, you don't look half bad. Take pride in that.</state>
- <state img="2-Flying.png">Okay! Yes! Now we're getting some place.</state>
+ <state img="2-Victory.png">Okay! Yes! Now we're getting some place.</state>
<state img="2-Confident.png">What ya pouting for? This game ain't over with yet. Keep your spirits up, you might just win this still. More unlikely things have happened before.</state>
<state img="2-Happy.png">Face the facts ~name~, this could be the beginning of the end for ya.</state>
</case>
@@ -3960,7 +4002,7 @@
<case tag="male_chest_is_visible">
<state img="2-Happy.png">Eh that's not bad. Seems you look after yourself.</state>
<state img="2-Horny.png">Well, well. Yum, yum. That's not half bad to look at.</state>
- <state img="2-Happy.png">I'd say that's a good trade for what you've got from me, ha ha ha.</state>
+ <state img="2-Victory.png">I'd say that's a good trade for what you've got from me, ha ha ha!</state>
<state img="2-Smug.png">Think you'll bounce back from this? In your dreams! This is gonna be the beginning of the end for ya.</state>
<state img="2-Confident.png">You ain't half bad to look at. Ain't gonna stop me from kicking you to the curb though.</state>
<state img="2-Confident.png">Well that ain't so bad to look at. Thanks.</state>
@@ -4171,6 +4213,11 @@
<state img="2-Bored.png">Ugh. Everyone's a comedian these days.</state>
<state img="2-Confident.png">Welll, y'know what they say. Don't get mad, get even. Gonna think of some real great, Saiyan grade pranks to pull on you, Saki.</state>
</case>
+ <case tag="opponent_stripped" alsoPlaying="haru">
+ <state img="custom:SSJ">Who knows, sweet-cheeks, maybe the danger is right over here. And maybe I'm spoiling for something! I'm game for a friendly punch-up if you are!</state>
+ <state img="custom:SSJ">Well if we've got no villains to clobber, maybe we can do something amongst ourselves! And I reckon you're a little tougher then ya look, why don't we spar the pair of us sometime?</state>
+ <state img="custom:SSJ">Hah! I ain't fought no one who uses an axe before! Fighting you sounds like a fine old time to me!</state>
+ </case>
<case tag="opponent_stripped" id="2-8" target="lucina" targetStage="1">
<state img="2-Laughing.png">Oh, you're a girl? My mistake.</state>
<state img="2-Distracted.png">Err, kay? Don't really know why you'd be hiding the fact that you're a girl, but sure, whatever.</state>
@@ -4494,7 +4541,7 @@
<case tag="must_strip_normal">
<state img="3-Angry.png">Eh...w-what!? Dammit, I'm gonna have to...dammit!</state>
<state img="3-Embarassed.png">Ugh. Should've known it'd come to this, given how closely matched we are.</state>
- <state img="3-Embarassed.png">Hell. I wanted a fight of this but...wasn't expecting to be pushed this far.</state>
+ <state img="3-Embarassed.png">Hell. I wanted a fight of this...but I wasn't expecting to be pushed this far.</state>
<state img="3-Angry.png">You've gotta be kidding me! Was expecting <i>you</i> to crumble under pressure at this point. Not me!</state>
<state img="3-Combat.png">Of all the rotten crap!</state>
<state img="3-Embarassed.png">Just when I needed my cards to pull through, they fail me. Perfect.</state>
@@ -4543,6 +4590,14 @@
<state img="3-Stripped.png">You think I'm gonna panic, just because I've lost a thing or two? Hell no! This is when a Saiyan is at their best.</state>
<state img="3-Stripped.png">I bet this floor's super sticky or something dumb like that. And if it is, ugh. I bet I know how it got that way.</state>
</case>
+ <case tag="stripped" alsoPlaying="nami">
+ <state img="3-Bored.png"><i>(Why the hell's she trying to pick a fight with me? Can't that idiot sense energy? She's gotta realise that I can flatten her in the blink of an eye.)</i></state>
+ </case>
+ <case tag="stripped" alsoPlaying="natsuki">
+ <state img="3-Stripped.png">Yes, it is. And if that's enough to blow your mind, it's gonna be pretty funny watching you react to all the other stuff that I can do.</state>
+ <state img="3-Flying.png">Heh. Y'know I'm starting to think that I could make some good money teaching you humans how to fly, seeing how many of ya can't but want to know how.</state>
+ <state img="3-Flying.png">Well girlie, I honestly don't know what to tell ya.</state>
+ </case>
<case tag="male_must_strip">
<state img="3-Flying.png">Tag! Gotcha!</state>
<state img="3-Confident.png">Ha! Ya like that? Got plenty more where that came from.</state>
@@ -4561,9 +4616,9 @@
</case>
<case tag="male_must_strip" target="jotaro" targetStage="0">
<state img="3-Smug.png">Well hello there, big, tall and mysterious. Got any surprises in store for little old me?</state>
- <state img="3-Distracted.png">You've been pretty quiet so far. I ain't complaining, just stating a fact.</state>
+ <state img="3-Distracted.png">You've been pretty quiet since ya got here. I ain't complaining about it, just stating a fact.</state>
<state img="3-Smug.png">Hmm. You kinda remind me of someone. Ain't gonna tell ya who though.</state>
- <state img="3-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy about him.</state>
+ <state img="3-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy as he does.</state>
</case>
<case tag="male_must_strip" target="jotaro" targetStage="1">
<state img="3-Annoyed.png">. . .</state>
@@ -4625,11 +4680,11 @@
<state img="3-Distracted.png">Pointy ears and a...robust constitution. You remind me of the Supreme Kai.</state>
</case>
<case tag="female_must_strip" target="florina" targetStage="0">
- <state img="3-Distracted.png">Hey. You seem nervous. Like, really, <really> nervous.</state>
+ <state img="3-Distracted.png">You seem nervous. Like, really, <really> nervous.</state>
<state img="3-Confident.png">You've gotten yourself worked up over something. Is it the game, or something else that's bothering ya?</state>
<state img="3-Happy.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
<state img="3-Confident.png">Hmm. Something's eating you up. Whatever's going through you mind right now, trust me, it ain't as bad as you think.</state>
- <state img="3-Happy.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
+ <state img="3-Happy.png">Hey, girlie. It's okay, y'know? Ya don't have to fret about this sorta thing.</state>
</case>
<case tag="female_must_strip" target="florina" targetStage="1">
<state img="3-Excited.png">Alright, let's do this again. Come on, I know you've got this, you've <i>totally</i> got this one!</state>
@@ -4726,6 +4781,11 @@
<state img="3-Annoyed.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
<state img="3-Angry.png">Oh I know your type, ~name~. It's all sunshine and rainbows and obnoxiously long transformations. You really think that crap has any place on the battlefield?</state>
</case>
+ <case tag="female_must_strip" target="streaming-chan" targetStage="0" targetSayingMarker="viewers">
+ <state img="3-Annoyed.png">So...what, I'm on some kinda broadcast right now? Not entirely sure how I feel about that.</state>
+ <state img="3-Stretching.png">Hmm. One one hand, kinda like the thought of having a camera on me. What I don't like is the idea of this stuff ending up on Sadala somehow.</state>
+ <state img="3-Annoyed.png">Hey, is this channel thingy of yours showing solely on Earth? Last thing I need is the criminal underbelly of Sadala catching this stuff. Gonna take a <i>lot</i> of punching people before I hear the end of this.</state>
+ </case>
<case tag="tie">
<state img="3-Shocked.png">Wait...you've got...am I honestly seeing that right?</state>
<state img="3-Shocked.png">Say what? How the hell'd that happen?</state>
@@ -4753,7 +4813,7 @@
<case tag="male_removing_accessory" target="jotaro" targetStage="0">
<state img="3-Shocked.png">What the hell!?</state>
<state img="3-Shocked.png">Woah, jeez!</state>
- <state img="3-Thinking.png">Wait, did I just miss something? That almost looked like Hit's...</state>
+ <state img="3-Angry.png">Wait, did I just miss something? That almost looked like...no...</state>
</case>
<case tag="male_removing_accessory" target="jotaro" targetStage="1">
<state img="3-Angry.png">. . .</state>
@@ -4869,6 +4929,11 @@
<state img="3-Bored.png">Hmm. Was that one more of a pop or a pow? Ugh, that sounds like something Goku would say. Or one of the Zenos.</state>
<state img="3-Bored.png">Noisiest game of strip poker I've ever played.</state>
</case>
+ <case tag="female_removing_accessory" target="streaming-chan" targetStage="0">
+ <state img="3-Angry.png">So. If this <i>is</i> being broadcast galactically? Your ass is gonna be grass, ya hear me?</state>
+ <state img="3-Combat.png">Let's just try to keep this stuff local. To <i>Earth</i>. Else I might get kinda upset about that, if ya feel me.</state>
+ <state img="3-Happy.png">Heh. So, this crap's live is it? Well then, to all y'all pervs at home? Must feel pretty swell, knowing you've hit the damn jackpot over here!</state>
+ </case>
<case tag="female_removed_accessory">
<state img="3-Embarassed.png">Ugh, I really am behind.</state>
<state img="3-Embarassed.png">I'm gonna have to turn this around, and do it fast.</state>
@@ -4892,7 +4957,7 @@
</case>
<case tag="female_removed_accessory" target="leggy" targetStage="1">
<state img="3-Laughing.png">Well, ya never. You could be some kinda genius at this for all I know.</state>
- <state img="3-Thinking.png">Stranger things have happened though Sometimes the most harmless looking people are actually the most dangerous.</state>
+ <state img="3-Thinking.png">Sometimes the most harmless looking people are actually the most dangerous. I better be keeping my eye on ya all the same.</state>
<state img="3-Combat.png">Still. I'm gonna keep my wits about me. Never know what an opponent has in store for ya.</state>
</case>
<case tag="female_removed_accessory" target="marinette" targetStage="1">
@@ -4987,8 +5052,8 @@
<state img="3-Combat.png">Hmm. Maybe you're for real...nah. Soon as I start thinking that you're gonna "switch back" and be all like, haha, told ya so. I'm harder to fool than that I'm afraid.</state>
</case>
<case tag="female_removing_minor" id="3-10" target="leggy" targetStage="2">
- <state img="3-Shocked.png">Hey, wait, Those are <i>shears</i>!? Wow, you've actually surprised me with that move.</state>
- <state img="3-Thinking.png">Wait. Shaving? Oooh! Wait, I get it. You're gonna count that as a play.</state>
+ <state img="3-Shocked.png">Wait, those are <i>shears</i> you've got there!? Wow, you've actually surprised me with that move.</state>
+ <state img="3-Thinking.png">Wait. Shaving? Oooh! Right, I get it. You're gonna count that as a play.</state>
<state img="3-Bored.png">Oh. And here I thought I had ya knocked out. Seems you ain't ready to quit just yet.</state>
</case>
<case tag="female_removing_minor" target="meia" targetStage="1">
@@ -5030,7 +5095,7 @@
<state img="3-Confident.png">Well. Sorry 'bout that? Heh, is that what you wanted me to say right now? You want a kiss and a cuddle as well? Sorry, ain't getting me on board with this performance, lady.</state>
</case>
<case tag="female_removed_minor" target="leggy" targetStage="3">
- <state img="3-Happy.png">Hey, y'know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
+ <state img="3-Happy.png">Know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
<state img="3-Confident.png">Well ya won't catch me shaving myself to keep in the game. So fair enough, that's one gutsy move to make right there.</state>
<state img="3-Bored.png">Don't like to admit it, but ya had me fooled there. I thought I'd beaten ya already.</state>
<state img="3-Laughing.png">Heh. So ya had some tricks to play after all. Seems like you've got half a brain in that head of yours at least.</state>
@@ -5067,7 +5132,7 @@
<state img="3-Laughing.png">Haha, I bet Cabba would be sweating up a storm right now. And this isn't even the worst bit for you yet!</state>
<state img="3-Confident.png">You put most species out there to shame in the looks department, and you seem like a good example of yours. I'll give ya that much.</state>
<state img="3-Happy.png">Y'know compared to most Saiyans, you don't look half bad. Take pride in that.</state>
- <state img="3-Flying.png">Okay! Yes! Now we're getting some place.</state>
+ <state img="3-Victory.png">Okay! Yes! Now we're getting some place.</state>
<state img="3-Confident.png">What ya pouting for? This game ain't over with yet. Keep your spirits up, you might just win this still. More unlikely things have happened before.</state>
<state img="3-Happy.png">Face the facts ~name~, this could be the beginning of the end for ya.</state>
</case>
@@ -5185,7 +5250,7 @@
<case tag="male_chest_is_visible">
<state img="3-Happy.png">Eh that's not bad. Seems you look after yourself.</state>
<state img="3-Horny.png">Well, well. Yum, yum. That's not half bad to look at.</state>
- <state img="3-Happy.png">I'd say that's a good trade for what you've got from me, ha ha ha.</state>
+ <state img="3-Victory.png">I'd say that's a good trade for what you've got from me, ha ha ha!</state>
<state img="3-Smug.png">Think you'll bounce back from this? In your dreams! This is gonna be the beginning of the end for ya.</state>
<state img="3-Confident.png">You ain't half bad to look at. Ain't gonna stop me from kicking you to the curb though.</state>
<state img="3-Confident.png">Well that ain't so bad to look at. Thanks.</state>
@@ -5658,14 +5723,14 @@
<case tag="bad_hand">
<state img="4-Annoyed.png">I...won't let you win...I won't!</state>
<state img="4-Bored.png"><i>(Should I try bluffing still?)</i> You've really got me on the ropes here.</state>
- <state img="4-Embarassed.png">Grr. This shouldn't be happening.</state>
+ <state img="4-Angry.png">Grr. This shouldn't be happening.</state>
<state img="4-Bored.png">Jeez. This game just hasn't been going my way. Kind of amazing really, in a painful sort of way.</state>
<state img="4-Thinking.png"><i>(Should I blow something up outside or something, cause a distraction? Could be in and out before any of these slouches even notice.)</i></state>
<state img="4-Angry.png">Seriously?! Am I being set up here? Sure starting to feel that way!</state>
<state img="4-Angry.png">There's no way in hell I'm this bad! Alright, Who is it? Who here's tryin' to pull a fast one on me? Be honest and I might just go easy on ya.</state>
<state img="4-Distracted.png"><i>(Think they'd stop the game if I blew something up? Maybe?)</i></state>
<state img="4-Embarassed.png">So, err...anyone here willing to trade? I'd owe ya one hell of a favor if ya throw me a bone here.</state>
- <state img="4-Embarassed.png">Grr...bastards.</state>
+ <state img="4-Embarassed.png">Bastards.</state>
<state img="4-Annoyed.png">Dammit, come on!</state>
<state img="4-Laughing.png">Haha-haha! Oh man, this is so crap even I have to laugh at it!</state>
<state img="4-Bored.png">Be willing to part with a small fortune if it meant rolling back the clock on this game. Any takers?</state>
@@ -5986,8 +6051,8 @@
<state img="4-Combat.png">Hmm. Maybe you're for real...nah. Soon as I start thinking that you're gonna "switch back" and be all like, haha, told ya so. I'm harder to fool than that I'm afraid.</state>
</case>
<case tag="female_removing_minor" id="4-10" target="leggy" targetStage="2">
- <state img="4-Shocked.png">Hey, wait, Those are <i>shears</i>!? Wow, you've actually surprised me with that move.</state>
- <state img="4-Thinking.png">Wait. Shaving? Oooh! Wait, I get it. You're gonna count that as a play.</state>
+ <state img="4-Shocked.png">Wait, those are <i>shears</i> you've got there!? Wow, you've actually surprised me with that move.</state>
+ <state img="4-Thinking.png">Wait. Shaving? Oooh! Right, I get it. You're gonna count that as a play.</state>
<state img="4-Bored.png">Oh. And here I thought I had ya knocked out. Seems you ain't ready to quit just yet.</state>
</case>
<case tag="female_removing_minor" target="ryuko" targetStage="1">
@@ -6016,7 +6081,7 @@
<state img="4-Confident.png">Well. Sorry 'bout that? Heh, is that what you wanted me to say right now? You want a kiss and a cuddle as well? Sorry, ain't getting me on board with this performance, lady.</state>
</case>
<case tag="female_removed_minor" target="leggy" targetStage="3">
- <state img="4-Happy.png">Hey, y'know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
+ <state img="4-Happy.png">Know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
<state img="4-Confident.png">Well ya won't catch me shaving myself to keep in the game. So fair enough, that's one gutsy move to make right there.</state>
<state img="4-Bored.png">Don't like to admit it, but ya had me fooled there. I thought I'd beaten ya already.</state>
<state img="4-Laughing.png">Heh. So ya had some tricks to play after all. Seems like you've got half a brain in that head of yours at least.</state>
@@ -6261,8 +6326,8 @@
<state img="4-Horny.png">That sure is a chest. Man, you look <i>good</i>.</state>
<state img="4-Embarassed.png">You remind of that Brianne woman. Or was it Ribrianne? Either way I'd prefer not to think about her. Ever again.</state>
<state img="4-Confident.png">Hey a bust that big ain't necessary by any means. But who's gonna complain about them? Jealous people maybe, ha!</state>
- <state img="4-Shocked.png">Oh don't get me wrong they look awesome, but they ain't exactly practical for anyone who wants to be a fighter.</state>
- <state img="4-Thinking.png">Oh wow, those are even bigger than I thought.</state>
+ <state img="4-Smug.png">Don't get me wrong, those look awesome. But they ain't exactly practical for anyone who wants to be a fighter.</state>
+ <state img="4-Shocked.png">Oh wow, those are even bigger than I thought.</state>
<state img="4-Happy.png">Hey good for you, not everyone pulls off the busty look like that.</state>
<state img="4-Horny.png">Sexy. Though, I can't imagine they'd be easy to walk around with. Heavy right?</state>
</case>
@@ -6390,7 +6455,7 @@
<state img="4-Horny.png">Well, I won't distract ya. Gonna make this awkward real fast if I keep blabbering on like an idiot.</state>
<state img="4-Horny.png">Oh boy. Well, get to it then I guess.</state>
<state img="4-Stripped.png">Well dummy, this is gonna be...weird. Could be interesting, but I guess we'll find that out.</state>
- <state img="4-Embarassed.png">Normally I'd enjoy this. But standing here like I am, sure makes it stranger.</state>
+ <state img="4-Embarassed.png">I imagine that I'd enjoy this, normally. But standing here like I am? Sure makes this a whole lot stranger.</state>
<state img="4-Stripped.png">Well then if you're gonna do it, at least give it your all. This is supposed to be for my benefit, I'll have ya remember!</state>
<state img="4-Stripped.png">Gonna say this one time, keep the staring to a minimum. Last thing I need is some pervert drooling all over me.</state>
</case>
@@ -6602,14 +6667,14 @@
<case tag="bad_hand">
<state img="5-Annoyed.png">I...won't let you win...I won't!</state>
<state img="5-Bored.png"><i>(Should I try bluffing still?)</i> You've really got me on the ropes here.</state>
- <state img="5-Embarassed.png">Grr. This shouldn't be happening.</state>
+ <state img="5-Angry.png">Grr. This shouldn't be happening.</state>
<state img="5-Bored.png">Jeez. This game just hasn't been going my way. Kind of amazing really, in a painful sort of way.</state>
<state img="5-Thinking.png"><i>(Should I blow something up outside or something, cause a distraction? Could be in and out before any of these slouches even notice.)</i></state>
<state img="5-Angry.png">Seriously?! Am I being set up here? Sure starting to feel that way!</state>
<state img="5-Angry.png">There's no way in hell I'm this bad! Alright, Who is it? Who here's tryin' to pull a fast one on me? Be honest and I might just go easy on ya.</state>
<state img="5-Distracted.png"><i>(Think they'd stop the game if I blew something up? Maybe?)</i></state>
<state img="5-Embarassed.png">So, err...anyone here willing to trade? I'd owe ya one hell of a favor if ya throw me a bone here.</state>
- <state img="5-Embarassed.png">Grr...bastards.</state>
+ <state img="5-Embarassed.png">Bastards.</state>
<state img="5-Annoyed.png">Dammit, come on!</state>
<state img="5-Laughing.png">Haha-haha! Oh man, this is so crap even I have to laugh at it!</state>
<state img="5-Bored.png">Be willing to part with a small fortune if it meant rolling back the clock on this game. Any takers?</state>
@@ -6866,8 +6931,8 @@
<state img="5-Combat.png">Hmm. Maybe you're for real...nah. Soon as I start thinking that you're gonna "switch back" and be all like, haha, told ya so. I'm harder to fool than that I'm afraid.</state>
</case>
<case tag="female_removing_minor" id="5-10" target="leggy" targetStage="2">
- <state img="5-Shocked.png">Hey, wait, Those are <i>shears</i>!? Wow, you've actually surprised me with that move.</state>
- <state img="5-Thinking.png">Wait. Shaving? Oooh! Wait, I get it. You're gonna count that as a play.</state>
+ <state img="5-Shocked.png">Wait, those are <i>shears</i> you've got there!? Wow, you've actually surprised me with that move.</state>
+ <state img="5-Thinking.png">Wait. Shaving? Oooh! Right, I get it. You're gonna count that as a play.</state>
<state img="5-Bored.png">Oh. And here I thought I had ya knocked out. Seems you ain't ready to quit just yet.</state>
</case>
<case tag="female_removing_minor" target="ryuko" targetStage="1">
@@ -6896,7 +6961,7 @@
<state img="5-Confident.png">Well. Sorry 'bout that? Heh, is that what you wanted me to say right now? You want a kiss and a cuddle as well? Sorry, ain't getting me on board with this performance, lady.</state>
</case>
<case tag="female_removed_minor" target="leggy" targetStage="3">
- <state img="5-Happy.png">Hey, y'know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
+ <state img="5-Happy.png">Know what? Fair play. I probably wouldn't have thought of that if I was in your place.</state>
<state img="5-Confident.png">Well ya won't catch me shaving myself to keep in the game. So fair enough, that's one gutsy move to make right there.</state>
<state img="5-Bored.png">Don't like to admit it, but ya had me fooled there. I thought I'd beaten ya already.</state>
<state img="5-Laughing.png">Heh. So ya had some tricks to play after all. Seems like you've got half a brain in that head of yours at least.</state>
@@ -7141,8 +7206,8 @@
<state img="5-Horny.png">That sure is a chest. Man, you look <i>good</i>.</state>
<state img="5-Embarassed.png">You remind of that Brianne woman. Or was it Ribrianne? Either way I'd prefer not to think about her. Ever again.</state>
<state img="5-Confident.png">Hey a bust that big ain't necessary by any means. But who's gonna complain about them? Jealous people maybe, ha!</state>
- <state img="5-Shocked.png">Oh don't get me wrong they look awesome, but they ain't exactly practical for anyone who wants to be a fighter.</state>
- <state img="5-Thinking.png">Oh wow, those are even bigger than I thought.</state>
+ <state img="5-Smug.png">Don't get me wrong, those look awesome. But they ain't exactly practical for anyone who wants to be a fighter.</state>
+ <state img="5-Shocked.png">Oh wow, those are even bigger than I thought.</state>
<state img="5-Happy.png">Hey good for you, not everyone pulls off the busty look like that.</state>
<state img="5-Horny.png">Sexy. Though, I can't imagine they'd be easy to walk around with. Heavy right?</state>
</case>
@@ -7266,7 +7331,7 @@
<state img="5-Horny.png">Well, I won't distract ya. Gonna make this awkward real fast if I keep blabbering on like an idiot.</state>
<state img="5-Horny.png">Oh boy. Well, get to it then I guess.</state>
<state img="5-Stripped.png">Well dummy, this is gonna be...weird. Could be interesting, but I guess we'll find that out.</state>
- <state img="5-Embarassed.png">Normally I'd enjoy this. But standing here like I am, sure makes it stranger.</state>
+ <state img="5-Embarassed.png">I imagine that I'd enjoy this, normally. But standing here like I am? Sure makes this a whole lot stranger.</state>
<state img="5-Stripped.png">Well then if you're gonna do it, at least give it your all. This is supposed to be for my benefit, I'll have ya remember!</state>
<state img="5-Stripped.png">Gonna say this one time, keep the staring to a minimum. Last thing I need is some pervert drooling all over me.</state>
</case>
@@ -7892,12 +7957,18 @@
<state img="6-Mast1.png">Hngh...been doing so much gang stuff, I ain't had no chance to find some alone time. Need this bad.</state>
<state img="6-Mast2.png">Gotta...keep my voice in. <i>H-haaah</i>...easier said than done.</state>
<state img="6-Mast1.png">Hmm. This is...hot...in a twisted sorta way, maybe.</state>
- <state img="6-Mast3.png">Yeah, get a good look ya bunch of pervs. Why wouldn't ya watch a girl do this to herself?</state>
+ <state img="6-Annoyed.png">Yeah, get a good look ya bunch of pervs. Why wouldn't ya watch a girl do this to herself?</state>
<state img="6-Mast2.png">Ooh...</state>
<state img="6-Mast3.png">Okay. Starting to feel pretty good. Still disgusted at myself for having to do this though.</state>
<state img="6-Mast3.png">Dammit. Couldn't win one little card game. Now I gotta do this to myself.</state>
- <state img="6-Angry.png">The best the universes have to offer? I kicked their asses. But a damn pervert's card game? Apparently that's too much for me to deal with.</state>
+ <state img="6-Angry.png">The best the universes have to offer? I kicked their asses. But a damn pervert's card game? Apparently that's too much for me to deal with!</state>
<state img="6-Annoyed.png">Ugh. At this point I just wanna get this over with.</state>
+ <state img="6-Mast2.png">Haa. Hah! Hitting the right spot there.</state>
+ <state img="6-Mast1.png">*pant* *pant*</state>
+ <state img="6-Mast3.png">Mmmm...haaah.</state>
+ <state img="6-Mast2.png"><i>(Kale, I don't really wanna be thinking about you right now. But I guess I just can't help it.)</i></state>
+ <state img="6-Mast3.png"><i>(Who was that other Saiyan at the Tournament, Vegita? He looked like the kinda guy who knew how to handle a woman.)</i></state>
+ <state img="6-Mast1.png"><i>(Could you last five minutes with me, Cabba? Betcha wouldn't say no if I pushed ya into a room and just...destroyed ya.)</i></state>
</case>
<case tag="heavy_masturbating">
<state img="6-Heavy1.png">Haaah...you have any idea how worked up sparring and training gets someone?</state>
@@ -7913,7 +7984,7 @@
<case tag="finishing_masturbating">
<state img="custom:Finishing">HAAAAAAAAAAAAH!</state>
<state img="custom:Finishing">Oh shi...OH SHI...SHHHH-</state>
- <state img="custom:Finishing">GAH-HAAH-AAGGH-</state>
+ <state img="custom:Finishing">GAH-HAAH-AAGGH!</state>
<state img="custom:Finishing">I'm cuhhh...I'm cummm...I'm...haaaah.</state>
<state img="custom:Finishing">Haaah...haaah...h-h-aaahhh...</state>
<state img="custom:Finishing">Can't hold back no more! Ahh...</state>
@@ -8455,13 +8526,13 @@
<state img="7-Smug.png">Who did I leave in charge of the gang? Kale? Heh, they'd better do what she tells them. They'd be total idiots to get on her <i>bad</i> side.</state>
</case>
<case tag="game_over_defeat">
- <state img="7-Happy.png">Certainly some highs and lows during that. And yeah I am pretty disappointed with myself, but I had fun. Can't deny that.</state>
- <state img="7-Happy.png">I can't say I've had the worst time. Winning certainly would have helped, but hey. Can't win 'em all.</state>
- <state img="7-Laughing.png">Heh heh, well never-mind. Thanks for the fun, it sure has been. kinda weird seeing you all get yourselves off though.</state>
- <state img="7-Stretching.png">Ah well, never-mind.</state>
- <state img="7-Stretching.png">Well it ain't been a total waste tonight. I blew off steam, got some Super Saiyan training in, and I got a show or two to go along with it. Not all bad.</state>
- <state img="7-Embarassed.png">Looks like I gotta train more before I can hope to win a game of this. Least against people other than the dummies in my crew.</state>
- <state img="7-Embarassed.png">I came here expecting to clean house. You sure as hell surprised me, that's for sure.</state>
+ <state img="7-Happy.png" collectible="stolen_scouter">Certainly some highs and lows during that. And yeah I am pretty disappointed with myself, but I had fun. Can't deny that.</state>
+ <state img="7-Smug.png" collectible="stolen_scouter">I can't say I've had the worst time. Winning certainly would have helped, but hey. Can't win 'em all.</state>
+ <state img="7-Laughing.png" collectible="stolen_scouter">Heh heh, well never mind. Thanks for the fun, it sure has been. kinda weird seeing you all get yourselves off though.</state>
+ <state img="7-Stretching.png" collectible="stolen_scouter">Ah well, never mind.</state>
+ <state img="7-Stretching.png" collectible="stolen_scouter">Well it ain't been a total waste tonight. I blew off steam, got some Super Saiyan training in, and I got a show or two to go along with it. Not all bad.</state>
+ <state img="7-Annoyed.png" collectible="stolen_scouter">Looks like I gotta train more before I can hope to win a game of this. Least against people other than the dummies in my crew.</state>
+ <state img="7-Embarassed.png" collectible="stolen_scouter">I came here expecting to clean house. You sure as hell surprised me, that's for sure.</state>
</case>
<case tag="game_over_defeat" notSaidMarker="finished" priority="100">
<state img="custom:Finished" marker="finished">That was good. <i>Real</i> good. Damn I needed that.</state>
@@ -8474,13 +8545,15 @@
<state img="custom:Finished" marker="finished">Hoo. That doesn't half tingle.</state>
</case>
<case tag="game_over_defeat" target="human">
- <state img="7-Happy.png" collectible="SJJ4" collectible-value="+1">Certainly some highs and lows during that. And yeah I am pretty disappointed with myself, but I had fun. Can't deny that.</state>
- <state img="7-Happy.png" collectible="SJJ4" collectible-value="+1">I can't say I've had the worst time. Winning certainly would have helped, but hey. Can't win 'em all.</state>
- <state img="7-Laughing.png" collectible="SJJ4" collectible-value="+1">Heh heh, well never-mind. Thanks for the fun, it sure has been. kinda weird seeing you all get yourselves off though.</state>
- <state img="7-Stretching.png" collectible="SJJ4" collectible-value="+1">Oh well, never-mind.</state>
- <state img="7-Stretching.png" collectible="SJJ4" collectible-value="+1">Well it ain't been a total waste tonight. I blew off steam, got some Super Saiyan training in, and I got a show or two to go along with it. Not all bad.</state>
- <state img="7-Embarassed.png" collectible="SJJ4" collectible-value="+1">Looks like I gotta train more before I can hope to win a game of this. Least against people other than the dummies in my crew.</state>
- <state img="7-Embarassed.png" collectible="SJJ4" collectible-value="+1">I came here expecting to clean house. You sure as hell surprised me, that's for sure.</state>
+ <state img="7-Happy.png" collectible="SJJ4" collectible-value="+4">Certainly some highs and lows during that. And yeah I am pretty disappointed with myself, but I had fun. Can't deny that.</state>
+ <state img="7-Smug.png" collectible="SJJ4" collectible-value="+4">I can't say I've had the worst time. Winning certainly would have helped, but hey. Can't win 'em all.</state>
+ <state img="7-Laughing.png" collectible="SJJ4" collectible-value="+4">Heh heh, well never mind. Thanks for the fun, it sure has been. kinda weird seeing you all get yourselves off though.</state>
+ <state img="7-Stretching.png" collectible="SJJ4" collectible-value="+4">Oh well, never mind.</state>
+ <state img="7-Stretching.png" collectible="SJJ4" collectible-value="+4">Well it ain't been a total waste tonight. I blew off steam, got some Super Saiyan training in, and I got a show or two to go along with it. Not all bad.</state>
+ <state img="7-Annoyed.png" collectible="SJJ4" collectible-value="+4">Looks like I gotta train more before I can hope to win a game of this. Least against people other than the dummies in my crew.</state>
+ <state img="7-Embarassed.png" collectible="SJJ4" collectible-value="+4">I came here expecting to clean house. You sure as hell surprised me, that's for sure.</state>
+ <state img="7-Confident.png" collectible="SJJ4" collectible-value="1">Good game, ~player~. I'll get ya next time.</state>
+ <state img="7-Angry.png">Well done, ~player~. But you ain't gonna get me next time, that I can garantee.</state>
</case>
</stage>
diff --git a/opponents/caulifla/collectibles.xml b/opponents/caulifla/collectibles.xml
index e1dac63a13a3cf7cb02a34fbf5de695cc9fc1d78..7206e0c69fecdd423197d0909b9a7611c0cb12e5 100644
--- a/opponents/caulifla/collectibles.xml
+++ b/opponents/caulifla/collectibles.xml
@@ -1,12 +1,17 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<collectibles>
- <collectible id="SSJ4" img="opponents/caulifla/Collectible 01.png" thumbnail="opponents/caulifla/Collectible 01.png">
- <title>A Primal Transformation</title>
- <subtitle>Monkey Business</subtitle>
- <text>Nobody told Caulifla that Super Saiyan 4 was a little different from the other transformations. Lucky you.</text>
- <unlock>Work and dedication go a long way. Win four games against a table containing Cauilfla to unlock this collectible.</unlock>
- <hidden>true</hidden>
- <hide-details>true</hide-details>
- <counter>4</counter>
- </collectible>
-</collectibles>
+<?xml version='1.0' encoding='UTF-8'?>
+<collectibles>
+ <collectible id="stolen_scouter" img="opponents/caulifla/Scouter.jpg" thumbnail="opponents/caulifla/Scouter.jpg">
+ <title>A Stolen Scouter</title>
+ <subtitle>Blowing up since the nineties.</subtitle>
+ <text>"Hey there! It's me, Caulifla. I got my hands on a box of these old things since I last saw ya. Man, I haven't seen any of these in ages! You were saying that you can't sense energy, so I figured this could come in handy. And hey, why don't ya call me sometime? We'll hit up that invetory place again if we're both in the area. Catch ya later!"</text>
+ <unlock>Finish a game with Caulifla to unlock this collectable.</unlock>
+ </collectible>
+ <collectible id="SJJ4" img="opponents/caulifla/SSJ4 Caulifla.png" thumbnail="opponents/caulifla/SSJ4 Caulifla.png">
+ <title>Super Saiyan 4</title>
+ <subtitle>A Saiyan connected to their primal roots.</subtitle>
+ <text>"Son of a bitch! Why'd no one tell me this would make me lose my top?! Ugh! That crap aside, I wanted to thank ya. I've been working hard for a wild transformation like this, and you've given me the inspiration I needed to attain this awesome power! I'm gonna kick Goku's ass for sure next time we meet! And it's all thanks to you, buddy!"</text>
+ <unlock>A Saiyan gets stronger every time they're defeated, and you've defeated Caulifla four times in battle, unlocking the Super Saiyan 4 achievement as a result. </unlock>
+ <hidden>true</hidden>
+ <counter>4</counter>
+ </collectible>
+</collectibles>
diff --git a/opponents/caulifla/editor.xml b/opponents/caulifla/editor.xml
index 376ab70baa90a693309cbebf257e543e849f1f81..eea76168ebe96ed2b5519a432d2fa439e57e09cf 100644
--- a/opponents/caulifla/editor.xml
+++ b/opponents/caulifla/editor.xml
@@ -1,37 +1,19 @@
<?xml version='1.0' encoding='UTF-8'?>
<metadata>
<owner>caulifla</owner>
- <noteworthy>
- <case name="Super Saiyan Transformation" id="2" min="1" max="1">
- <description>Caulifla can change her hair and eye color on command. Cool huh? Also she gains a shining, golden aura around herself and grows in battle power immensely. But who cares about that sort of thing?</description>
- </case>
- <case name="Super Orgasm" id="3" min="7" max="7">
- <description>Looks like Caulifla turned Super Saiyan again. Must have felt pretty good, huh? This one doesn't stick around for as long however, it was kinda unintentional after all. </description>
- </case>
- </noteworthy>
+ <noteworthy />
<hidden />
- <responses>
- <response id="4" opponent="sayaka" opponentId="4" />
- <response id="5" opponent="saki_zls" opponentId="1" />
- <response id="6" opponent="saki_zls" opponentId="2" />
- <response id="7" opponent="saki_zls" opponentId="3" />
- <response id="8" opponent="lucina" opponentId="1" />
- <response id="9" opponent="chihiro" opponentId="2" />
- <response id="10" opponent="leggy" opponentId="1" />
- <response id="11" opponent="erufuda" opponentId="4" />
- </responses>
+ <responses />
<notes />
<labels />
<prefixes />
- <nextId>11</nextId>
+ <nextId>0</nextId>
<markers>
- <marker scope="Public" name="" />
- <marker scope="Public" name="aura fade" />
- <marker scope="Public" name="aura up" />
+ <marker scope="Public" name="aura_fade" />
+ <marker scope="Public" name="aura_up" />
<marker scope="Public" name="finished" />
- <marker scope="Public" name="lost three" />
- <marker scope="Public" name="lost twice" />
- <marker scope="Public" name="Sixth Universe" />
- <marker scope="Public" name="trimmed" />
+ <marker scope="Public" name="lost_three" />
+ <marker scope="Public" name="lost_twice" />
+ <marker scope="Public" name="Sixth_Universe" />
</markers>
</metadata>
diff --git a/opponents/caulifla/meta.xml b/opponents/caulifla/meta.xml
index 8a17424fc42c47bc8848f42858e21d2bd0e2dca6..7c0d2360f217adc5f21fa69bd1abce605d71528f 100644
--- a/opponents/caulifla/meta.xml
+++ b/opponents/caulifla/meta.xml
@@ -41,6 +41,6 @@
<tag from="2" to="2">clothing_destruction</tag>
</tags>
<has_collectibles>true</has_collectibles>
- <lines>2410</lines>
+ <lines>2463</lines>
<poses>146</poses>
</opponent>