Skip to content
Snippets Groups Projects
Commit b7b22db5 authored by FarawayVision's avatar FarawayVision
Browse files

Merge branch 'bot-update-misty_hgss' into 'master' 

Misty_hgss: Typo fixes and additional lines at Mae, Alice (MGQ), and Saki (ZLS)

See merge request spnati/spnati!38
parents 5f4147f7 e6092285
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
opponents/misty_hgss/behaviour.xml
+ 5804
− 5388
View file @ b7b22db5
This diff is collapsed.
opponents/misty_hgss/collectibles.xml
+ 2
− 2
View file @ b7b22db5
<?xml version='1.0' encoding='UTF-8'?>
<collectibles />
<?xml version='1.0' encoding='UTF-8'?>
<collectibles />
opponents/misty_hgss/edit-dialogue.txt
+ 2703
− 2541
View file @ b7b22db5
This diff is collapsed.
opponents/misty_hgss/editor.xml
+ 41
− 41
View file @ b7b22db5
<?xml version='1.0' encoding='UTF-8'?>
<metadata>
<owner>misty_hgss</owner>
<noteworthy />
<hidden />
<responses />
<notes />
<labels />
<prefixes />
<nextId>0</nextId>
<markers>
<marker scope="Public" name="" />
<marker scope="Public" name="askfor_number">Misty asks a male player for his number. This occurs while she is naked, but has yet to lose.</marker>
<marker scope="Public" name="date_daydreams" />
<marker scope="Public" name="DMG_type" />
<marker scope="Public" name="found_date">A male player has agreed to exchange phone numbers with Misty.</marker>
<marker scope="Public" name="misty_allnight">Misty reveals that her fantasy is to spend an entire night having sex. (Prompted by Streaming-Chan)</marker>
<marker scope="Public" name="misty_badwithdates">Misty lets it slip that she has bad luck with dates</marker>
<marker scope="Public" name="misty_beproud">Misty tells a female character about to reveal their breasts to have pride in them.</marker>
<marker scope="Public" name="misty_dvawagertaken">Misty accepts D.Va's wager.</marker>
<marker scope="Public" name="misty_idothisoften">Misty openly admits to masturbating frequently.</marker>
<marker scope="Public" name="misty_noguys">Misty has shown up to the game expecting there to be some guys, only for there to be none.</marker>
<marker scope="Public" name="misty_notembarressed">Misty explains why she's not embarrassed about stripping.</marker>
<marker scope="Public" name="misty_proudbody">Misty tells a female character about to reveal their crotch to be proud of their body.</marker>
<marker scope="Public" name="misty_waxing">Misty reveals that she waxes her pubic hair.</marker>
<marker scope="Public" name="player_male">The player is male.</marker>
<marker scope="Public" name="seen_androgynous" />
<marker scope="Public" name="seen_blade" />
<marker scope="Public" name="seen_blade2" />
<marker scope="Public" name="seen_bluehair" />
<marker scope="Public" name="seen_greenhair" />
<marker scope="Public" name="seen_gun" />
<marker scope="Public" name="seen_pinkhair" />
<marker scope="Public" name="seen_ponytail" />
<marker scope="Public" name="seen_redhair" />
<marker scope="Public" name="seen_tanlines" />
<marker scope="Public" name="seen_verylonghair" />
<marker scope="Public" name="seen_wings" />
<marker scope="Public" name="turned_around">Misty has turned around to see if she's caught anyone's attention.</marker>
</markers>
</metadata>
<?xml version='1.0' encoding='UTF-8'?>
<metadata>
<owner>misty_hgss</owner>
<noteworthy />
<hidden />
<responses />
<notes />
<labels />
<prefixes />
<nextId>0</nextId>
<markers>
<marker scope="Public" name="" />
<marker scope="Public" name="askfor_number">Misty asks a male player for his number. This occurs while she is naked, but has yet to lose.</marker>
<marker scope="Public" name="date_daydreams" />
<marker scope="Public" name="DMG_type" />
<marker scope="Public" name="found_date">A male player has agreed to exchange phone numbers with Misty.</marker>
<marker scope="Public" name="misty_allnight">Misty reveals that her fantasy is to spend an entire night having sex. (Prompted by Streaming-Chan)</marker>
<marker scope="Public" name="misty_badwithdates">Misty lets it slip that she has bad luck with dates</marker>
<marker scope="Public" name="misty_beproud">Misty tells a female character about to reveal their breasts to have pride in them.</marker>
<marker scope="Public" name="misty_dvawagertaken">Misty accepts D.Va's wager.</marker>
<marker scope="Public" name="misty_idothisoften">Misty openly admits to masturbating frequently.</marker>
<marker scope="Public" name="misty_noguys">Misty has shown up to the game expecting there to be some guys, only for there to be none.</marker>
<marker scope="Public" name="misty_notembarressed">Misty explains why she's not embarrassed about stripping.</marker>
<marker scope="Public" name="misty_proudbody">Misty tells a female character about to reveal their crotch to be proud of their body.</marker>
<marker scope="Public" name="misty_waxing">Misty reveals that she waxes her pubic hair.</marker>
<marker scope="Public" name="player_male">The player is male.</marker>
<marker scope="Public" name="seen_androgynous" />
<marker scope="Public" name="seen_blade" />
<marker scope="Public" name="seen_blade2" />
<marker scope="Public" name="seen_bluehair" />
<marker scope="Public" name="seen_greenhair" />
<marker scope="Public" name="seen_gun" />
<marker scope="Public" name="seen_pinkhair" />
<marker scope="Public" name="seen_ponytail" />
<marker scope="Public" name="seen_redhair" />
<marker scope="Public" name="seen_tanlines" />
<marker scope="Public" name="seen_verylonghair" />
<marker scope="Public" name="seen_wings" />
<marker scope="Public" name="turned_around">Misty has turned around to see if she's caught anyone's attention.</marker>
</markers>
</metadata>
opponents/misty_hgss/meta.xml
+ 42
− 47
View file @ b7b22db5
<?xml version='1.0' encoding='UTF-8'?>
<opponent>
<enabled>false</enabled>
<first>Misty</first>
<last />
<label>Misty</label>
<pic>0-neutral.png</pic>
<gender>female</gender>
<height />
<from>Pokemon (HGSS)</from>
<writer>YaterTG</writer>
<artist>HorseKiller</artist>
<description>Misty is the Gym Leader of Cerulean City and gives the Cascade Badge to trainers that defeat her. She's worried about being unable to find romance and is here in hopes of picking up a date.</description>
<layers>4</layers>
<tags>
<tag>brunette</tag>
<tag>medium_hair</tag>
<tag>messy_hair</tag>
<tag>green_eyes</tag>
<tag>fair-skinned</tag>
<tag>athletic</tag>
<tag>muscular</tag>
<tag>shaved</tag>
<tag>medium_breasts</tag>
<tag from="4" to="6">tan_lines</tag>
<tag>leotard</tag>
<tag>no_bra</tag>
<tag>no_underwear</tag>
<tag>cheerful</tag>
<tag>confident</tag>
<tag>kind</tag>
<tag>lonely</tag>
<tag>perverted</tag>
<tag>seductive</tag>
<tag>tomboy</tag>
<tag>straight</tag>
<tag>single</tag>
<tag>kanto</tag>
<tag>fantasy</tag>
<tag>video_game</tag>
<tag>nintendo</tag>
<tag>pokemon</tag>
</tags>
<has_collectibles>false</has_collectibles>
<lines>675</lines>
<poses>90</poses>
</opponent>
<?xml version='1.0' encoding='UTF-8'?>
<opponent>
<enabled>false</enabled>
<first>Misty</first>
<last />
<label>Misty</label>
<pic>0-neutral.png</pic>
<gender>female</gender>
<height />
<from>Pokemon (HGSS)</from>
<writer>YaterTG</writer>
<artist>HorseKiller</artist>
<description>Misty is the Gym Leader of Cerulean City and gives the Cascade Badge to trainers that defeat her. She's worried about being unable to find romance and is here in hopes of picking up a date.</description>
<layers>4</layers>
<tags>
<tag>ginger</tag>
<tag>medium_hair</tag>
<tag>messy_hair</tag>
<tag>green_eyes</tag>
<tag>fair-skinned</tag>
<tag>athletic</tag>
<tag>shaved</tag>
<tag>medium_breasts</tag>
<tag from="4" to="6">tan_lines</tag>
<tag>scantily-clad</tag>
<tag>cheerful</tag>
<tag>confident</tag>
<tag>kind</tag>
<tag>perverted</tag>
<tag>seductive</tag>
<tag>tomboy</tag>
<tag>straight</tag>
<tag>single</tag>
<tag>kanto</tag>
<tag>video_game</tag>
<tag>nintendo</tag>
<tag>pokemon</tag>
</tags>
<has_collectibles>false</has_collectibles>
<lines>700</lines>
<poses>89</poses>
</opponent>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment