From 0806e5e011a54cdd77e65a9348e62a216a73e868 Mon Sep 17 00:00:00 2001
From: alphaman21#4448 <spnati.official@gmail.com>
Date: Sun, 31 Jan 2021 05:20:40 +0000
Subject: [PATCH] Cynthia: Targeted lines to Aoba, Susie, Ringo, and Wii Fit
Trainer
**Total Linecount: ** 4674 -> 4700 (+26)
**Targeted Linecount: ** 2594 -> 2620 (+26)
**Total Targeted Characters: ** 111 -> 115 (+4)
Targeting Updates:
- `aoba`: 0 -> 14 (+14)
- `ringo_ando`: 0 -> 2 (+2)
- `wiifitfemale`: 0 -> 2 (+2)
- `susie`: 0 -> 8 (+8)
Command executed by: alphaman21#4448
---
opponents/cynthia/behaviour.xml | 69 ++++++++++++++++++++++++++++++++-
opponents/cynthia/editor.xml | 22 ++++++++++-
opponents/cynthia/meta.xml | 4 +-
3 files changed, 90 insertions(+), 5 deletions(-)
diff --git a/opponents/cynthia/behaviour.xml b/opponents/cynthia/behaviour.xml
index 46c8fe8d5b9..b9b6b990428 100644
--- a/opponents/cynthia/behaviour.xml
+++ b/opponents/cynthia/behaviour.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!--This file was machine generated using the Character Editor v6.2.1 at 9:32:15 PM on January 26, 2021. Do not edit this file directly unless you know what you're doing.-->
+<!--This file was machine generated using the Character Editor v6.2.1 at 1:22:24 PM on January 31, 2021. Do not edit this file directly unless you know what you're doing.-->
<opponent>
<version>v6.2.1</version>
<first>Cynthia</first>
@@ -1487,6 +1487,51 @@
<state img="#-thinking.png" marker="NamiLucario4">At first thought, I would have said that you were describing a Skiddo, Nami, but then I remembered that a Skiddo wouldn't have a blue nose. A bit of a regional variation, perhaps?</state>
<state img="#-thinking.png" marker="NamiLucario4">Hmm... Aside from the blue nose, that's a spot-on description of a Skiddo, Nami. I've never seen a Skiddo with a blue nose before, but it could just be regional thing...</state>
</case>
+ <case stage="0-8" id="656" priority="900">
+ <condition role="other" character="susie" sayingMarker="SurvivorPudding" />
+ <state img="#-thinking.png" marker="SusiePudding1">Survivor pudding? Is that a Galarian dish, Susie? I always found Galarian cuisine to be quite... <i>odd</i> compared to the cuisine of other regions.</state>
+ <state img="#-thinking.png" marker="SusiePudding1">I can't claim to have heard of this <i>Survivor pudding</i>, but based on your description, it sounds like Galarian cuisine. I've never been fond of their local cuisine, to be honest.</state>
+ </case>
+ <case stage="0-8" id="657" priority="900">
+ <condition role="other" character="susie" sayingMarker="QuestionGodSlayers" />
+ <state img="#-battleready.png" marker="SusieGod1">I wouldn't necessarily called it as "<i>defeated</i>", but I once bested the Legendary Pokémon Giratina in battle with the help of a young trainer, Susie. It was the culmination of a long and complicated story.</state>
+ <state img="#-battleready.png" marker="SusieGod1">Even though I don't know anybody that has defeated a god, Susie, I can say that I've managed to hold my own in a battle against the Deity Pokémon Giratina. I did receive assistance from a local young trainer...</state>
+ </case>
+ <case stage="0-8" id="658" priority="900">
+ <condition role="other" character="susie" sayingMarker="QuestionGodSlayers" />
+ <state img="#-excited.png" marker="SusieGod1">What kind of charms do you have, Susie? Are they for warding off evil spirits, or for good health, or a simple accessory?</state>
+ <state img="#-excited.png" marker="SusieGod1">Throughout history, charms have been the product of superstitious belief, although recently, they've been used as accessories. So, which one is it, Susie? I can't wait to see what you have.</state>
+ </case>
+ <case stage="0-8" id="659" priority="900">
+ <condition role="other" character="aoba" sayingMarker="QnA_Hajime" />
+ <state img="#-fingerup.png" marker="AobaFlint1">"Always happy and excited" would be the perfect way of describing Flint, one of the Sinnoh Elite Four members, Aoba. He's always fired up for anything and everything.</state>
+ <state img="#-fingerup.png" marker="AobaFlint1">The most excitable person in my native Sinnoh is Elite Four Flint. I've heard that he's been trying to get a disillusioned gym leader back into proper spirits, just to give you an idea of how much he values happiness, Aoba.</state>
+ </case>
+ <case stage="0-8" id="660" priority="900">
+ <condition role="other" character="aoba" sayingMarker="QnA_Hifumi" />
+ <state img="#-embarrassed.png" marker="AobaAnimal1">"Animal"... "Bears"... I can't say I've heard either of those terms before, Aoba...</state>
+ <state img="#-embarrassed.png" marker="AobaAnimal1">... What exactly are "Animal" and "Bears", Aoba? I'm not familiar with both of those terms...</state>
+ </case>
+ <case stage="0-8" id="661" priority="900">
+ <condition role="other" character="aoba" sayingMarker="QnA_Kou" />
+ <state img="#-excited.png" marker="AobaCaitlin1">My friend Caitlin sleeps for a better portion of the day, yet she's still one of the strongest trainer in all of Unova, Aoba. I don't know how she does it either.</state>
+ <state img="#-excited.png" marker="AobaCaitlin1">If you consider sleeping all the time as being lazy, Caitlin would fit your bill with flying colors, Aoba. Even though she's in her bed almost the entire day, she's still an Elite Four member, and is quite the powerful trainer.</state>
+ </case>
+ <case stage="0-8" id="662" priority="900">
+ <condition role="other" character="aoba" sayingMarker="QnA_Momo" />
+ <state img="#-fingerup.png" marker="AobaChampion1">{small}As the Sinnoh League Champion, every trainer aspires of surpassing me in Pokémon battle, Aoba. There was this one young trainer though that challenged me to battle more than a dozen times. Even after they began spamming Full Restores, I still emerged victorious, and they eventually gave up.{!reset}</state>
+ <state img="#-fingerup.png" marker="AobaChampion1">{small}It's inevitable when you're the League Champion, but one young trainer stands out in particular, Aoba. The kid must have battled more close to a dozen times, sometimes even twice per day! It got to the point that they kept using Full Restore in a futile attempt at besting me, until I finally had enough and sent them home. {!reset}</state>
+ </case>
+ <case stage="0-8" id="663" priority="900">
+ <condition role="other" character="aoba" sayingMarker="QnA_Umiko" />
+ <state img="#-happy.png" marker="AobaGarchomp1">My Garchomp appears intimidating and physically imposing, but she's actually quite friendly with children, Aoba.</state>
+ <state img="#-happy.png" marker="AobaGarchomp1">People frequently tell me how scary my Garchomp looks, but she's actually very nice and gentle, Aoba. There's no reason to be afraid of her outside of battles.</state>
+ </case>
+ <case stage="0-8" id="664" priority="900">
+ <condition role="other" character="aoba" sayingMarker="Aoba_QnA_France" />
+ <state img="#-thinking.png" marker="AobaFrance1">I've never been to France before... As a matter of fact, I've never heard of France before. Where exactly is France, Aoba?</state>
+ <state img="#-thinking.png" marker="AobaFrance1">Where would you say France is, Aoba? I can't say I've ever heard of the name before.</state>
+ </case>
<case stage="0-8" priority="890">
<condition role="other" character="meia" sayingMarker="tablet" />
<state img="#-sarcastic.png" marker="MeiaTablet">Oh, are you checking your work schedule on your tablet, Meia? You don't happen to have any appointments after this game, do you?</state>
@@ -7051,7 +7096,7 @@
<state img="#-battleready.png" marker="GalateaPast1">If Arceus wanted you to be miserable and remorseful, then leaving you no memories surely achieved the goal. Not only did it detach you from your past as a human, it also left you with nothing to return to, nobody to ask for help, and no joy in life.</state>
</case>
<case stage="0-10">
- <condition role="target" character="nami" stage="4" sayingMarker="cynthia3" />
+ <condition role="target" character="nami" stage="4" />
<state img="#-surprised.png" marker="NamiSpy1">Do you really think your government has put up surveillance in this place, Nami? Would they really go to such length just to eavesdrop on people?</state>
<state img="#-surprised.png" marker="NamiSpy1">You're suspicious that your government might have sent one of their personnel undercover in this place, Nami? Is that something they're known to do?</state>
<state img="#-surprised.png" marker="NamiSpy1">Is there someone in particular in here that you suspect as being a spy, Nami, or is it just a general suspicion?</state>
@@ -7696,6 +7741,26 @@
<state img="#-frustrated.png" marker="CharaEgo1">My word, of all the psychotic egomaniacs I have encountered, you might just be the most deluded yet! At least you're not trying to blow up priceless ruins, if that can even be considered a silver lining.</state>
<state img="#-frustrated.png" marker="CharaEgo1">You might not have the power to manipulate universes, but you sure have the ego to fill one! Next, you'll tell me that you can create a universe in your image with just the snap of your finger!</state>
</case>
+ <case stage="0-10">
+ <condition role="target" character="ringo_ando" stage="0" />
+ <state img="#-fingerup.png" marker="RingoIntro1">All this talk of energy and spell-casting gives me the impression that you're a psychic, Ringo. Am I correct in my deduction?</state>
+ <state img="#-fingerup.png" marker="RingoIntro1">Although I have no evidence to back it up, from the mannerisms I've seen from you so far, you must be a psychic, Ringo.</state>
+ </case>
+ <case stage="0-10">
+ <condition role="target" character="susie" stage="0" />
+ <state img="#-aggressive.png" marker="SusieIntro1">Now, now, playing around with knives is a bit irresponsible, especially when you're wearing a mask that obscures your field of vision. Why don't you put down your knife, before I take immediate action?</state>
+ <state img="#-aggressive.png" marker="SusieIntro1">This is hardly the time and place to be playing around with a sharp blade, no matter how much protection you wear in your face. Put the knife down, so I can focus on the game instead of planning of disarming you.</state>
+ </case>
+ <case stage="0-10">
+ <condition role="target" character="aoba" stage="0" />
+ <state img="#-excited.png" marker="AobaIntro1">You mentioned earlier that you were a model, Aoba, right? Are you involved with magazine publications, or are you more of a runway model?</state>
+ <state img="#-excited.png" marker="AobaIntro1">I was curious as to what extent your role as a model is, Aoba? Do you simply pose for pictures, or are you those models that are actively advertised?</state>
+ </case>
+ <case stage="0-10">
+ <condition role="target" character="wiifitfemale" />
+ <state img="#-excited.png" marker="WiifitIntro1">My, you look like one of those ancient marble statues! Rather fitting, considering how the statues are meant to present the ideal human form.</state>
+ <state img="#-excited.png" marker="WiifitIntro1">Your appearance reminds me of those old marble statues commonly displayed in museums. Given your form, which I would consider to be the physical ideal of fitness, you wouldn't at all look out of place.</state>
+ </case>
<case stage="0-10" id="416">
<condition filter="adventurer" status="not_lost_some" role="target" />
<state img="#-happy.png" oneShotId="79">Ah, an adventurer. I remember when I used to go to adventures when I was a kid. Filling up my Pokédex was hard work, but very fulfilling.</state>
diff --git a/opponents/cynthia/editor.xml b/opponents/cynthia/editor.xml
index 0a480db9d83..36acf2ab361 100644
--- a/opponents/cynthia/editor.xml
+++ b/opponents/cynthia/editor.xml
@@ -280,6 +280,13 @@
<response id="649" opponent="lyralei" opponentId="68" />
<response id="650" opponent="twisted_fate" opponentId="48" />
<response id="652" opponent="twisted_fate" opponentId="18" />
+ <response id="656" opponent="susie" opponentId="210" />
+ <response id="659" opponent="aoba" opponentId="78" />
+ <response id="660" opponent="aoba" opponentId="79" />
+ <response id="661" opponent="aoba" opponentId="80" />
+ <response id="662" opponent="aoba" opponentId="81" />
+ <response id="663" opponent="aoba" opponentId="82" />
+ <response id="664" opponent="aoba" opponentId="84" />
</responses>
<notes>
<note id="610">Good prompt for Neptune's goddess powers?</note>
@@ -626,7 +633,7 @@
<label id="121" label="" folder="Q&A Prompts" sort="0" />
<label id="571" label="" folder="Q&A Prompts" sort="0" />
</labels>
- <nextId>655</nextId>
+ <nextId>664</nextId>
<markers>
<marker scope="Public" name="" />
<marker scope="Public" name="+" />
@@ -663,6 +670,13 @@
<marker scope="Public" name="AnnaSiblings1" />
<marker scope="Public" name="AnnaStimulus" />
<marker scope="Public" name="AnnaStimulus1" />
+ <marker scope="Public" name="AobaAnimal1" />
+ <marker scope="Public" name="AobaCaitlin1" />
+ <marker scope="Public" name="AobaChampion1" />
+ <marker scope="Public" name="AobaFlint1" />
+ <marker scope="Public" name="AobaFrance1" />
+ <marker scope="Public" name="AobaGarchomp1" />
+ <marker scope="Public" name="AobaIntro1" />
<marker scope="Public" name="ArashAnimal1" />
<marker scope="Public" name="ArashCooking1" />
<marker scope="Public" name="ArashDrinks1" />
@@ -699,6 +713,7 @@
<marker scope="Public" name="CammyIntro1" />
<marker scope="Public" name="CatfolkComment" />
<marker scope="Public" name="CatriaIntro1" />
+ <marker scope="Public" name="CharaEgo1" />
<marker scope="Public" name="CharaIntro1" />
<marker scope="Public" name="CharaIntro2" />
<marker scope="Public" name="CharaIntro3" />
@@ -1364,6 +1379,7 @@
<marker scope="Public" name="RibbonStories3" />
<marker scope="Public" name="RinColor1" />
<marker scope="Public" name="RinFunnyWords1" />
+ <marker scope="Public" name="RingoIntro1" />
<marker scope="Public" name="RinWeirdWord1" />
<marker scope="Public" name="SakiGameboy3" />
<marker scope="Public" name="SakiGreeting1" />
@@ -1459,6 +1475,9 @@
<marker scope="Public" name="SupernovaTechnology1" />
<marker scope="Public" name="SupernovaTechnology2" />
<marker scope="Public" name="SupernovaTechnology3" />
+ <marker scope="Public" name="SusieGod1" />
+ <marker scope="Public" name="SusieIntro1" />
+ <marker scope="Public" name="SusiePudding1" />
<marker scope="Public" name="SyrenneIntro1" />
<marker scope="Public" name="TeamGalacticNoOneListens">Cynthia is disappointed that nobody is taking the threat of Team Galactic seriously.</marker>
<marker scope="Public" name="TharjaIntro1" />
@@ -1486,6 +1505,7 @@
<marker scope="Public" name="TwilightIntro1" />
<marker scope="Public" name="UnusualSkinComment" />
<marker scope="Public" name="WeissIntro1" />
+ <marker scope="Public" name="WiifitIntro1" />
<marker scope="Public" name="YangIntro1" />
<marker scope="Public" name="YueliaButterfree1" />
<marker scope="Public" name="YueliaPromptAndy" />
diff --git a/opponents/cynthia/meta.xml b/opponents/cynthia/meta.xml
index 0bd2a9c0951..0c8ec744769 100644
--- a/opponents/cynthia/meta.xml
+++ b/opponents/cynthia/meta.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<opponent>
- <lastupdate>1611487867751</lastupdate>
+ <lastupdate>1612070544284</lastupdate>
<enabled>true</enabled>
<first>Cynthia</first>
<last />
@@ -38,6 +38,6 @@
<tag>hero</tag>
</tags>
<has_collectibles>true</has_collectibles>
- <lines>4671</lines>
+ <lines>4697</lines>
<poses>205</poses>
</opponent>
--
GitLab