From 299a6791aaf12db99d66fe8e47aacac86ef46db3 Mon Sep 17 00:00:00 2001
From: coolcat001100#6801 <spnati.official@gmail.com>
Date: Mon, 1 Feb 2021 03:03:47 +0000
Subject: [PATCH] Jim: The Hamburglar is stealing my free time and youth
**Total Linecount: ** 1725 -> 1753 (+28)
**Targeted Linecount: ** 972 -> 1000 (+28)
**Referenced Poses: ** 129 -> 128 (-1)
**Total Targeted Characters: ** 41 -> 42 (+1)
Targeting Updates:
- `saki_zls`: 49 -> 50 (+1)
- `miko`: 31 -> 33 (+2)
- `nami`: 4 -> 11 (+7)
- `twisted_fate`: 2 -> 5 (+3)
- `aoba`: 0 -> 1 (+1)
- `cynthia`: 32 -> 38 (+6)
- `neptune`: 55 -> 59 (+4)
- `jessie`: 40 -> 42 (+2)
- `komi-san`: 56 -> 58 (+2)
Command executed by: coolcat001100#6801
---
opponents/jim/behaviour.xml | 111 ++++++++++++++++++++++++++++++------
opponents/jim/editor.xml | 12 ++++
opponents/jim/meta.xml | 4 +-
3 files changed, 108 insertions(+), 19 deletions(-)
diff --git a/opponents/jim/behaviour.xml b/opponents/jim/behaviour.xml
index f04575aef30..34a911a43e0 100644
--- a/opponents/jim/behaviour.xml
+++ b/opponents/jim/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 12:44:40 PM on January 17, 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 10:01:10 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>Jim</first>
@@ -385,7 +385,7 @@
<case stage="0-8">
<condition role="other" character="galatea" />
<condition role="self" saidMarker="Galatea1c" />
- <state img="#-Forlorn.png" marker="Jim_Sarah">Man, where to even start with Sarah... lemme think for a bit.</state>
+ <state img="#-Forlorn.png" oneShotId="120" marker="Jim_Sarah">Man, where to even start with Sarah... lemme think for a bit.</state>
</case>
<case stage="0-8" id="5">
<condition role="self" saidMarker="Komi_strip3b" />
@@ -636,6 +636,14 @@
<state img="#-Conversational.png" marker="Hermione_resp0a">Nothin' complicated, Ms. Granger - my pal Matt thought I'd been workin' myself too hard lately, so he suggested I take a night off.</state>
<state img="#-Conversational.png" marker="Hermione_resp0a">Well, let's just say that this is my first little vacation in quite some time, Ms. Granger - been workin' so much on usual business lately that my man Matt was gettin' worried about me.</state>
</case>
+ <case stage="0-7">
+ <condition role="other" character="twisted_fate" stage="0-6" sayingMarker="Jim_Wildcard1" />
+ <state img="#-Confident.png">Well, I always liked to think of that as my strong suit. Keep thinkin' on your feet and leave your opponents guessin'.</state>
+ </case>
+ <case stage="5">
+ <condition role="other" character="aoba" stage="0-8" saying="kinda scare me" />
+ <state img="#-Neutral.png" marker="Aoba_scaring0">Really now? Was it somethin' I said earlier?</state>
+ </case>
<case stage="1">
<condition role="other" character="yunyun" stage="0-7" />
<state img="#-Conversational.png" marker="Yunyun1a">Heh, for someone callin' herself a demon, you sure are a far cry from the wicked an' evil sort, ain't ya?</state>
@@ -701,12 +709,14 @@
<state img="#-Neutral.png" marker="Laevatein_resp3b">If you don't mind me askin'... what was she like?</state>
</case>
<case stage="0">
- <condition role="other" character="nami" saying="Tough guy, huh? All those muscles aren't gonna help you here. You need brains, and a lot of luck." />
- <state img="#-Miffed.png">Well, sure hope it doesn't come down to that. Never was much with the former, and the latter's slipped me by these past few years.</state>
+ <condition role="other" character="nami" sayingMarker="jim0" />
+ <state img="#-Miffed.png" marker="Nami0a">Well, sure hope it doesn't come down to that. Never was much with the former, and the latter's slipped me by these past few years.</state>
+ <state img="#-Miffed.png" marker="Nami0a">Feelin' the odds are stacked against me, Nami? Sure hope I won't need to rely on luck, then...</state>
</case>
<case stage="1">
- <condition role="other" character="nami" saying="Why all the weaponry? You're not a bounty hunter by any chance, right?" />
- <state img="#-Conversational.png">Heh, no way. The kinda price that was on my head, I'd be shot dead the instant I walked into a bounty joint.</state>
+ <condition role="other" character="nami" sayingMarker="jim1" />
+ <state img="#-Conversational.png" marker="Nami1a">Heh, no way. The kinda price that was on my head, I'd be shot dead the instant I walked into a bounty joint.</state>
+ <state img="#-Conversational.png" marker="Nami1a">Not a chance, Nami. Most of my name may be cleared now, but I reckon plenty of bounty joints still got a death wish for me.</state>
</case>
<case stage="0">
<condition role="other" character="galatea" saying="Your face... so world weathered..." />
@@ -969,7 +979,17 @@
<case stage="3">
<condition role="other" character="jessie" sayingMarker="JimBike1" />
<state img="#-Conversational.png" marker="Jessie_Bikeridea1">Well, I suppose that depends, Jess' - you got any experience drivin' a stick-shift?</state>
- <state marker="Jessie_Bikerideb1">Maybe, maybe... but how smooth or rough do you like your rides, Jess'?</state>
+ <state img="#-Conversational.png" marker="Jessie_Bikerideb1">Maybe, maybe... but how smooth or rough do you like your rides, Jess'?</state>
+ </case>
+ <case stage="2">
+ <condition role="other" character="neptune" sayingMarker="nep_him_fun1" />
+ <state img="#-Relaxed.png">Drinkin' and talkin' with folks, mostly. Sometimes cards, sometimes tryin' to beat the high score in Lost Vikings. Sounds simple, I know, but it ain't bad.</state>
+ <state img="#-Relaxed.png">Nothin' that special - drinkin' and talkin', sometimes a challenge at cards or Lost Vikings. It's all good, though.</state>
+ </case>
+ <case stage="2">
+ <condition role="other" character="nami" sayingMarker="jim2" />
+ <state img="#-Neutral.png" marker="Nami2a">Yeah, you're about spot-on. Feels like there's been war in the Koprulu sector longer than there's ever been peace.</state>
+ <state img="#-Neutral.png" marker="Nami2a">Hate to say it, Nami, but you're right. The history of the Koprulu sector and its timeline of war are almost one and the same.</state>
</case>
<case stage="1">
<condition role="other" character="brock" />
@@ -1477,9 +1497,16 @@
<state img="#-Stripping.png">Well, that's always the hardest part - not knowin' if what you're tryin' is working or not. Believe me, I've had too many moments like that.</state>
<state img="#-Stripping.png">Yeah... the hardest choices are always the ones you ain't sure of. Hell, I lost track of the times I second-guessed myself a long time ago.</state>
</case>
+ <case stage="2">
+ <condition role="self" saidMarker="Cynthia_resp2a" />
+ <condition role="other" character="cynthia" sayingMarker="JimFuture2" />
+ <state img="#-Stripping.png">Hmph, I'd certainly believe it. Been fightin' for so long that I've almost forgotten what <i>not</i> bein' at war feels like.</state>
+ <state img="#-Stripping.png">Yeah, hate to say I can't really deny that. I got freedom for the people and revenge for myself, but... I'm only now realizin' I didn't plan much beyond that.</state>
+ </case>
<case stage="1">
- <condition role="other" character="nami" saying="But then what's all that stuff for?" />
- <state img="#-Stripping.png">Just feels better to have. You didn't bring all your trinkets there 'cause you're planning to use 'em, right?</state>
+ <condition role="other" character="nami" sayingMarker="jim12" />
+ <state img="#-Stripping.png" marker="Nami1b">Just feels better to have. You didn't bring all your trinkets there 'cause you're planning to use 'em, right?</state>
+ <state img="#-Stripping.png" marker="Nami1b">Just a comfort thing. I trust you didn't come here for trouble with your tools, and you can trust I didn't either.</state>
</case>
<case stage="0">
<condition role="other" character="galatea" saying="It's not the same for me. Scars and wear don't affect me in the same way... being stone..." />
@@ -1674,6 +1701,15 @@
<condition role="other" character="laevatein" sayingMarker="Laev_Jim_laegjarn" />
<state img="#-Stripping.png">Yeah... that's the true mark of family right there; when they'll always stand by you, even when they need you to do better.</state>
</case>
+ <case stage="4">
+ <condition role="other" character="saki_zls" saying="self-destructive idiot" />
+ <state img="#-Stripping.png">I mean... really, the less selfish part of me was always fightin' for the lives and rights of others. After all that... I sure as shit don't know.</state>
+ </case>
+ <case stage="3">
+ <condition role="other" character="jessie" sayingMarker="JimBike2" />
+ <state img="#-Stripping.png" marker="Jessie_Bikeridea2">Well, a biker should always make sure his partner enjoys the ride... especially if they wanna finish it together.</state>
+ <state img="#-Stripping.png" marker="Jessie_Bikerideb2">Hey, I always make sure I know what my ride-along enjoys... and how well they can hold on.</state>
+ </case>
<case stage="0-7" priority="50">
<condition role="self" saidMarker="Raynor_response_to_akko_scifi2" />
<condition role="other" character="akko" />
@@ -1996,7 +2032,7 @@
<state img="#-Miffed.png">Yeah... ain't <i>that</i> a timeless question.</state>
</case>
<case stage="6">
- <condition role="other" character="nami" saying="You don't have any more tattoos? Not that I'm interested, I'm just curious." />
+ <condition role="other" character="nami" saying="tattoos" />
<state img="#-Conversational.png">Hey, even I've got a limit on the ink I'd like in me. You gotta stop somewhere.</state>
</case>
<case stage="2" priority="101">
@@ -2226,6 +2262,15 @@
<state img="#-Heating up.png" marker="Jessie_Relationship04">Hm... hell, with this kinda situation, I'd be crazy to slip it on by...</state>
<state img="#-Heating up.png" marker="Jessie_Relationship04">Huh... well, you only live once, right...?</state>
</case>
+ <case stage="3">
+ <condition role="other" character="miko" saying="a great rank" />
+ <state img="#-Forlorn.png">Hm... guess no one can really deny that. Whether they want to or not.</state>
+ </case>
+ <case stage="2">
+ <condition role="other" character="nami" sayingMarker="jim2s" />
+ <state img="#-Conversational.png" marker="Nami1c">I think I'd pity them more than anything, Nami. In my experience, underestimatin' a woman with an air of danger is a quick way to the grave.</state>
+ <state img="#-Conversational.png" marker="Nami1c">Their loss, Nami. The way you trust that thing, I wouldn't be shocked if you could take any one of us down.</state>
+ </case>
<case stage="4">
<condition role="other" character="saki_zls" />
<state img="#-Forlorn.png">Good. If you take anything from tonight, make sure it's that.</state>
@@ -2816,6 +2861,11 @@
<state img="#-Neutral.png">I dunno if I'm just missin' something, Nep, but it sounds to me like bein' a goddess is just about doin' odd jobs.</state>
<state img="#-Neutral.png">So is that what bein' a goddess where you come from is like, Nep? Just doin' whatever odd tasks come up?</state>
</case>
+ <case stage="0-8 10">
+ <condition role="target" character="komi-san" stage="5" />
+ <state img="#-Relaxed.png" marker="Komi_strip5a">So how's the company 'round here look to you, kiddo? Found some friendly enough faces so far?</state>
+ <state img="#-Relaxed.png" marker="Komi_strip5a">So, gotten a good chance to find some good folk here, kiddo? Hopin' Najimi knew what she was doin' bringing you here after all.</state>
+ </case>
<case stage="0-8 10" priority="50">
<condition role="target" character="aimee" stage="0" />
<state img="#-Confident.png" oneShotId="30">Gotta say, cowgirl, I like your style. Good to see the ol' tradition's still alive.</state>
@@ -3247,6 +3297,11 @@
</trigger>
<trigger id="female_removing_major">
+ <case stage="0-8 10" priority="382">
+ <condition role="target" character="cynthia" stage="3" saidMarker="JimSkills1" sayingMarker="JimSkills2" />
+ <state img="#-Heating up.png">Damn, sure sounds like a whole lot goes into it... you must be one hell of a trainer if it's what got you famous.</state>
+ <state img="#-Heating up.png">Sounds to me like a ton of research goes into battlin' as much as it does the Pokemon themselves... you're definitely an exceptional woman if you're skilled in both.</state>
+ </case>
<case stage="0-8 10">
<condition role="target" character="sakura" stage="4" />
<state img="#-Relaxed.png">{small}Definitely glad to hear that. It's a far cry from the kind of mindless, tusks-and-tentacles, moanin'-in-constant-pain sort that the Zerg create.{!reset}</state>
@@ -3297,6 +3352,10 @@
<condition role="target" character="sakura" stage="5" />
<state img="#-Forlorn.png">Well... let's just say I can guarantee that you're already the nicest zombie I've ever met.</state>
</case>
+ <case stage="0-8 10">
+ <condition role="target" character="miko" stage="5" />
+ <state img="#-Conversational.png">Heh... now that you mention it, wonder if I can drag Valerian here with you sometime... now <i>that'd</i> be a meetin' for the ages.</state>
+ </case>
<case stage="0-8 10">
<state img="#-Conversational.png">And now the grand reason most people choose to come here...</state>
<state img="#-Relaxed.png">If you don't mind me sayin' - and I sure hope you don't, considering you're here and all... well, I think you're mighty fine.</state>
@@ -4162,7 +4221,7 @@
<state img="#-Neutral.png">So you have work, then? Like, some godly kinda work?</state>
</case>
<case stage="0-8 10">
- <condition role="target" character="miko" stage="5" />
+ <condition role="target" character="miko" stage="4" />
<state img="#-Confident.png">Sounds like a damn fine philosophy to me - kinda startin' to wish your reign was in Koprulu instead.</state>
</case>
<case stage="0-8 10">
@@ -4172,6 +4231,19 @@
<state img="#-Confident.png" marker="Meia_change1b">That's definitely good. It won't take 'em overnight to unlearn everythin' that was fed to them, of course, but if they're willin' to try...</state>
<state img="#-Confident.png" marker="Meia_change1b">Startin' to happen already, then? That's all the better - especially considerin' that kinda change probably ain't quick.</state>
</case>
+ <case stage="0-8 10">
+ <condition role="target" character="neptune" stage="5" />
+ <state img="#-Miffed.png">Wait, you don't even <i>do</i> most of it? Wouldn't bein' some all-powerful deity make it a snap?</state>
+ <state img="#-Miffed.png">Is there even a good reason to shirk it onto others? I'd think bein' an immortal goddes gives you enough time for everythin' else already.</state>
+ </case>
+ <case stage="0-8 10">
+ <condition role="target" character="twisted_fate" stage="0" />
+ <state img="#-Confident.png" marker="TF_strip0b">Well, consider it on, compadre! I'm interested to see what you pull... especially considerin' the usual crowd in this joint ain't exactly card regulars.</state>
+ </case>
+ <case stage="0-8 10">
+ <condition role="target" character="twisted_fate" stage="1" />
+ <state img="#-Conversational.png" marker="TF_strip1b">Heh, I certainly know a place or two like that... what're the folk of Bilgewater like, then? Friendly? Proud?</state>
+ </case>
</trigger>
<trigger id="opponent_stripped">
@@ -4188,7 +4260,7 @@
<case stage="0-8 10">
<condition role="target" character="brock" saidMarker="brock_raynor_dynamike" />
<condition role="other" character="aimee" />
- <state img="#-Conversational.png" marker="Brock_shadetoAimee">That's certainly a relief... between you and me, that RPG's a safer sight in your hands than Miss rooty-tooty-aim-and-shooty there.</state>
+ <state img="#-Conversational.png" oneShotId="118" marker="Brock_shadetoAimee">That's certainly a relief... between you and me, that RPG's a safer sight in your hands than Miss rooty-tooty-aim-and-shooty there.</state>
</case>
<case stage="0-8 10">
<condition role="target" character="chara_dreemurr" stage="1" saidMarker="ResponseRaynorCharaStripping1" />
@@ -4519,13 +4591,18 @@
<state img="#-Exasperated.png">...Gotta be honest - I <i>still</i> have no idea what your godly life is like.</state>
<state img="#-Exasperated.png">...I dunno if I'm just bein' dense or something, but I'm still confused as hell.</state>
</case>
+ <case stage="0-8 10">
+ <condition role="target" character="cynthia" stage="3" />
+ <state img="#-Neutral.png">I'd certainly hope so - especially considerin' the criminal element you mentioned earlier.</state>
+ <state img="#-Neutral.png">Glad to hear it - though I'd imagine those crooks you brought up might be some unfortunate exceptions.</state>
+ </case>
<case stage="0-8 10">
<condition role="target" character="brock" saidMarker="brock_raynor_moon" />
- <state img="#-Heating up.png" marker="Brock_ohfuckitsmoon">That's her, huh? Yeah... now that you mention it, she <i>has</i> been pretty excited about the prospect of losin'.</state>
+ <state img="#-Heating up.png" oneShotId="112" marker="Brock_ohfuckitsmoon">That's her, huh? Yeah... now that you mention it, she <i>has</i> been pretty excited about the prospect of losin'.</state>
</case>
<case stage="0-8 10">
<condition role="target" character="brock" saidMarker="brock_raynor_nomoon" />
- <state img="#-Heating up.png" marker="Brock_moon">Huh... she must be quite the strange one if it's at the point where she sticks out more than the guy waltzing in with an RPG.</state>
+ <state img="#-Heating up.png" oneShotId="110" marker="Brock_moon">Huh... she must be quite the strange one if it's at the point where she sticks out more than the guy waltzing in with an RPG.</state>
</case>
<case stage="0-8 10">
<condition role="target" character="brock" saidMarker="brock_raynor_dynamike" />
@@ -4533,15 +4610,15 @@
</case>
<case stage="0-8 10">
<condition role="target" character="brock" saidMarker="brock_raynor_alldead" />
- <state img="#-Neutral.png" marker="Brock_powerful">That powerful, huh... must be quite the nice piece of tech if so many are after it.</state>
+ <state img="#-Neutral.png" oneShotId="116" marker="Brock_powerful">That powerful, huh... must be quite the nice piece of tech if so many are after it.</state>
</case>
<case stage="0-8 10">
<condition role="target" character="brock" saidMarker="brock_raynor_pam" />
- <state img="#-Miffed.png" marker="Brock_scrap">...Scrap metal? Sounds to me like you'd literally have to pray to hit that spray.</state>
+ <state img="#-Miffed.png" oneShotId="108" marker="Brock_scrap">...Scrap metal? Sounds to me like you'd literally have to pray to hit that spray.</state>
</case>
<case stage="0-8 10">
<condition role="target" character="brock" saidMarker="brock_raynor_dynamike" />
- <state img="#-Conversational.png" marker="Brock_prospectors">Heh, guessin' he ain't exactly a friend of prospectors. Or anyone familiar with the term "danger close", for that matter.</state>
+ <state img="#-Conversational.png" oneShotId="114" marker="Brock_prospectors">Heh, guessin' he ain't exactly a friend of prospectors. Or anyone familiar with the term "danger close", for that matter.</state>
</case>
<case stage="0-8 10">
<condition role="target" character="brock" saidMarker="brock_raynor_barley" />
diff --git a/opponents/jim/editor.xml b/opponents/jim/editor.xml
index a22a4f16ac2..67096cc15a2 100644
--- a/opponents/jim/editor.xml
+++ b/opponents/jim/editor.xml
@@ -38,6 +38,7 @@
<marker scope="Public" name="01" />
<marker scope="Public" name="02" />
<marker scope="Public" name="04" />
+ <marker scope="Public" name="Aoba_scaring0" />
<marker scope="Public" name="Brock_C-14andHEV" />
<marker scope="Public" name="Brock_Dragon" />
<marker scope="Public" name="Brock_keepingcool" />
@@ -159,7 +160,9 @@
<marker scope="Public" name="Intergalactic_journey" />
<marker scope="Public" name="Jessie_3a" />
<marker scope="Public" name="Jessie_Bikeridea1" />
+ <marker scope="Public" name="Jessie_Bikeridea2" />
<marker scope="Public" name="Jessie_Bikerideb1" />
+ <marker scope="Public" name="Jessie_Bikerideb2" />
<marker scope="Public" name="Jessie_Relationship01" />
<marker scope="Public" name="Jessie_relationship02" />
<marker scope="Public" name="Jessie_Relationship02" />
@@ -228,6 +231,7 @@
<marker scope="Public" name="Komi_strip4b" />
<marker scope="Public" name="Komi_strip4c1" />
<marker scope="Public" name="Komi_strip4c2" />
+ <marker scope="Public" name="Komi_strip5a" />
<marker scope="Public" name="Komi-san0a" />
<marker scope="Public" name="Komi-san0b" />
<marker scope="Public" name="Komi-san1a" />
@@ -305,6 +309,12 @@
<marker scope="Public" name="Meia2c" />
<marker scope="Public" name="Meia3a" />
<marker scope="Public" name="Miko_royalty" />
+ <marker scope="Public" name="Nami0a" />
+ <marker scope="Public" name="Nami1a" />
+ <marker scope="Public" name="Nami1b" />
+ <marker scope="Public" name="Nami1c" />
+ <marker scope="Public" name="Nami2a" />
+ <marker scope="Public" name="Nami2b" />
<marker scope="Public" name="Nep_resp01" />
<marker scope="Public" name="Nep_resp02" />
<marker scope="Public" name="Nep_resp03" />
@@ -401,7 +411,9 @@
<marker scope="Public" name="Sakura3c" />
<marker scope="Public" name="Suck_it_Nova" />
<marker scope="Public" name="TF_strip0a" />
+ <marker scope="Public" name="TF_strip0b" />
<marker scope="Public" name="TF_strip1a" />
+ <marker scope="Public" name="TF_strip1b" />
<marker scope="Public" name="Yunyun0a" />
<marker scope="Public" name="Yunyun0b" />
<marker scope="Public" name="Yunyun1a" />
diff --git a/opponents/jim/meta.xml b/opponents/jim/meta.xml
index 89262937865..99abc215a39 100644
--- a/opponents/jim/meta.xml
+++ b/opponents/jim/meta.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<opponent>
- <lastupdate>1610905480449</lastupdate>
+ <lastupdate>1612148470634</lastupdate>
<enabled>false</enabled>
<first>Jim</first>
<last>Raynor</last>
@@ -40,6 +40,6 @@
<tag>hero</tag>
</tags>
<has_collectibles>true</has_collectibles>
- <lines>1725</lines>
+ <lines>1753</lines>
<poses>128</poses>
</opponent>
--
GitLab