add test files.
This commit is contained in:
parent
cc96bb5f3f
commit
58c595bf0b
65
test/test_diff_revisions/test_bug_3_from
Normal file
65
test/test_diff_revisions/test_bug_3_from
Normal file
@ -0,0 +1,65 @@
|
||||
{{Charabox|chara_name=Lita Kino
|
||||
|image_filename=Sailor_Jupter_01.jpg
|
||||
|image_description_1={{PAGENAME}}
|
||||
|image_description_2={{PAGENAME}}
|
||||
|birthday=December 5<BR>(age 30)
|
||||
|astrosign=Sagittarius
|
||||
|bloodtype=O
|
||||
|family= Orphaned
|
||||
|hobbies=Cooking,<BR> Shopping,<BR> reading romance novels,<BR> Award-winning Actress,<BR> Host on Japan's game show on [[wikipedia:TV Asahi|TV Asahi's]] <BR>''[[wikipedia:Russian Roulette (game show)|Russian Roulette]]''
|
||||
|sports= Martial arts
|
||||
|color= Sugar pink, <BR> green
|
||||
|class= Home Economics, <BR> History
|
||||
|noclass= Physics
|
||||
|food= Cherry pie, <br> Meatloaf
|
||||
|nofood= None
|
||||
|place= [[wikipedia:Six Flags Over Texas|Six Flags Over Texas]],<br>[[wikipedia:Six Flags Great America|Six Flags Great America]],<br>[[wikipedia:Six Flags America|Six Flags America]]
|
||||
|fortune=
|
||||
|habit= Obsesses over boys,<BR> Extinguishing Fires
|
||||
|skill= Cooking, <BR> strong,<BR> athletic
|
||||
|likes= Horse
|
||||
|dislikes= Airplanes, <BR> Cheaters, <BR> Fire (when left cooking unattended for too long)
|
||||
|dream= A bride, <BR> to own a bakery/florists'
|
||||
|motto= "Melts in your mouth, not in your hand."
|
||||
|stone=[[wikipedia:Emerald|Emerald]]
|
||||
|titles=Sailor Jupiter, Princess Jupiter,<BR>Kelly Landry}}
|
||||
|
||||
'''Makoto Kino''' is the [[Sailor Senshi]] of Jupiter. Her name means "Sincerity of Wood". [[wikipedia:Five_elements (Chinese philosophy)|Wood]], in Chinese astrology, represents strength and flexibility. She is very tall for her age, and studies the martial arts. She is very independant, as she was orphaned at an early age and has had to take care of herself. Her parents died in a plane crash, so thats why she's scared of planes. She sees herself as a protector, even before she became a [[sailor soldier]]. She is also curiously vulnerable - due to her need to take care of herself, she didn't have many close friends, until [[Usagi Tsukino]] offered to sit with her.
|
||||
|
||||
One of her quirks is that she is always obsessing over boys, who all look "just like" her old boyfriend.
|
||||
|
||||
==Forms==
|
||||
|
||||
===Sailor Jupiter===
|
||||
|
||||
[[Image:sailorjupiter]]
|
||||
|
||||
Her sailor suit has a dark green collar, dark green skirt, sugar pink front bow, sugar pink back bow, dark green small boots, a dark green choker with a gold star, and a green-stoned tiara. She wears pink rose-shaped earrings, and a special hair tie with two green round balls on it in Ratio 1 also add in [[wikipedia:Tatsunoko vs. Capcom: Ultimate All- Stars]].
|
||||
|
||||
===Princess Jupiter===
|
||||
|
||||
During the Silver Millennium, she was the ruler of the planet Jupiter. She is the Sailor Soldier of Nature & Strength.
|
||||
|
||||
===Queen Jupiter===
|
||||
|
||||
She is now Ruler of the Planet [[wikipedia:Jupiter|Jupiter]]
|
||||
|
||||
==Transformations==
|
||||
|
||||
*Jupiter Power! (Make Up!): Using her 1st transformation pen, Lita transformed into the 1st version of Sailor Jupiter. Used from Sailor Moon Classic through to the Sailor Moon R Pt.2.
|
||||
|
||||
*Jupiter Star Power! (Make Up!): Using her 2nd Star Transformation Power Stick to transform into the 2nd version of Sailor Jupiter, with stronger powers. Used from Sailor Moon R Pt. 2 to the middle of Sailor Moon SuperS.
|
||||
|
||||
*Jupiter Crystal Power! (Make Up!): Using her 3rd Crystal and Rod given to her by Pegasus she transforms into Super Sailor Jupiter the 3rd and final form of Jupiter in the anime.
|
||||
|
||||
==Attacks==
|
||||
|
||||
*Supreme Thunder: Blasting powerful Thunderbolts to crush the enemy.
|
||||
|
||||
*Supreme Thunder Dragon: An even more powerful version of Supreme Thunder, she creates a dragon out of thunder. *Sparkling Wide Pressure: Creating a bolt of electricity and thunder (A Less powerful version was called "Jupiter Thundercloud Zap").
|
||||
|
||||
*Jupiter Oak Evolution: Blasting beams of light with the strength of an oak tree.
|
||||
|
||||
{{charastub}}
|
||||
[[Category:Sailor soldiers]]
|
||||
[[Category:Usagi Tsukino and her Friends]]
|
88
test/test_diff_revisions/test_bug_3_to
Normal file
88
test/test_diff_revisions/test_bug_3_to
Normal file
@ -0,0 +1,88 @@
|
||||
{{Charabox|chara_name=Lita Kino
|
||||
|image_filename=Sailor_Jupter_01.jpg
|
||||
|image_description_1={{PAGENAME}}
|
||||
|image_description_2={{PAGENAME}}
|
||||
|birthday=December 5<BR>(age 30)
|
||||
|astrosign=Sagittarius
|
||||
|bloodtype=O
|
||||
|family= Orphaned
|
||||
|hobbies=Cooking,<BR> Shopping,<BR> reading romance novels,<BR> Award-winning Actress,<BR> Host on Japan's game show on [[wikipedia:TV Asahi|TV Asahi's]] <BR>''[[wikipedia:Russian Roulette (game show)|Russian Roulette]]''
|
||||
|sports= Martial arts
|
||||
|color= Sugar pink, <BR> green
|
||||
|class= Home Economics, <BR> History
|
||||
|noclass= Physics
|
||||
|food= Cherry pie, <br> Meatloaf
|
||||
|nofood= None
|
||||
|place= [[wikipedia:Six Flags Over Texas|Six Flags Over Texas]],<br>[[wikipedia:Six Flags Great America|Six Flags Great America]],<br>[[wikipedia:Six Flags America|Six Flags America]]
|
||||
|fortune=
|
||||
|habit= Obsesses over boys,<BR> Extinguishing Fires
|
||||
|skill= Cooking, <BR> strong,<BR> athletic
|
||||
|likes= Horse
|
||||
|dislikes= Airplanes, <BR> Cheaters, <BR> Fire (when left cooking unattended for too long)
|
||||
|dream= A bride, <BR> to own a bakery/florists'
|
||||
|motto= "Melts in your mouth, not in your hand."
|
||||
|stone=[[wikipedia:Emerald|Emerald]]
|
||||
|titles=Sailor Jupiter, Princess Jupiter,<BR>Kelly Landry}}
|
||||
|
||||
|
||||
|
||||
|
||||
'''Makoto Kino''' is the [[Sailor Senshi]] of Jupiter. Her name means "Sincerity of Wood". [[wikipedia:Five_elements (Chinese philosophy)|Wood]], in Chinese astrology, represents strength and flexibility. She is very tall for her age, and studies the martial arts. She is very independant, as she was orphaned at an early age and has had to take care of herself. Her parents died in a plane crash, so thats why she's scared of planes. She sees herself as a protector, even before she became a [[sailor soldier]]. She is also curiously vulnerable - due to her need to take care of herself, she didn't have many close friends, until [[Usagi Tsukino]] offered to sit with her.
|
||||
|
||||
One of her quirks is that she is always obsessing over boys, who all look "just like" her old boyfriend.
|
||||
|
||||
|
||||
==Forms==
|
||||
|
||||
|
||||
===Sailor Jupiter===
|
||||
|
||||
|
||||
[[Image:sailorjupiter]]
|
||||
|
||||
|
||||
Her sailor suit has a dark green collar, dark green skirt, sugar pink front bow, sugar pink back bow, dark green small boots, a dark green choker with a gold star, and a green-stoned tiara. She wears pink rose-shaped earrings, and a special hair tie with two green round balls on it in Ratio 1 also add in [[wikipedia:Tatsunoko vs. Capcom: Ultimate All- Stars]].
|
||||
|
||||
|
||||
|
||||
===Princess Jupiter===
|
||||
|
||||
|
||||
During the Silver Millennium, she was the ruler of the planet Jupiter. She is the Sailor Soldier of Nature & Strength.
|
||||
|
||||
|
||||
|
||||
===Queen Jupiter===
|
||||
|
||||
|
||||
She is now Ruler of the Planet [[wikipedia:Jupiter|Jupiter]]
|
||||
|
||||
|
||||
|
||||
==Transformations==
|
||||
|
||||
|
||||
*Jupiter Power! (Make Up!): Using her 1st transformation pen, Lita transformed into the 1st version of Sailor Jupiter. Used from Sailor Moon Classic through to the Sailor Moon R Pt.2.
|
||||
|
||||
|
||||
*Jupiter Star Power! (Make Up!): Using her 2nd Star Transformation Power Stick to transform into the 2nd version of Sailor Jupiter, with stronger powers. Used from Sailor Moon R Pt. 2 to the middle of Sailor Moon SuperS.
|
||||
|
||||
|
||||
*Jupiter Crystal Power! (Make Up!): Using her 3rd Crystal and Rod given to her by Pegasus she transforms into Super Sailor Jupiter the 3rd and final form of Jupiter in the anime.
|
||||
|
||||
|
||||
==Attacks==
|
||||
|
||||
|
||||
*Supreme Thunder: Blasting powerful Thunderbolts to crush the enemy.
|
||||
|
||||
|
||||
*Supreme Thunder Dragon: An even more powerful version of Supreme Thunder, she creates a dragon out of thunder. *Sparkling Wide Pressure: Creating a bolt of electricity and thunder (A Less powerful version was called "Jupiter Thundercloud Zap").
|
||||
|
||||
|
||||
*Jupiter Oak Evolution: Blasting beams of light with the strength of an oak tree.
|
||||
|
||||
|
||||
{{charastub}}
|
||||
[[Category:Sailor soldiers]]
|
||||
[[Category:Usagi Tsukino and her Friends]]
|
43
test/test_diff_revisions/test_bug_4_from
Normal file
43
test/test_diff_revisions/test_bug_4_from
Normal file
@ -0,0 +1,43 @@
|
||||
{{charabox |chara_name=Setsuna Meiou
|
||||
|image_filename=Sailor_Pluto-333.jpg
|
||||
|image_description_1=Setsuna Meiou
|
||||
|image_description_2=Setsuna Meiou
|
||||
|birthday=October 29
|
||||
|astrosign=Scorpio
|
||||
|bloodtype=A
|
||||
|family=none
|
||||
|hobbies=shopping, sewing
|
||||
|color=dark red
|
||||
|class=Physics
|
||||
|noclass= Music
|
||||
|food=Green tea
|
||||
|nofood=Eggplant
|
||||
|habit=Being Sick
|
||||
|skill=Sewing
|
||||
|dislikes=Cockroaches
|
||||
|dream= A fashion designer
|
||||
|stone=[[wikipedia:Garnet|Garnet]]
|
||||
|titles=Sailor Pluto,<BR>Princess Pluto, <BR> Puu (nickname from [[Chibi-Usa]]),<BR><span style="color:green;"/span>}}
|
||||
|
||||
'''Setsuna Meioh''' (known as '''Trista Meioh''' in the english dub) is '''Sailor Pluto''', and she guards the gates of time. We first see her in Sailor Moon R, where she watches over [[Chibi-Usa]] in the past. She has a very special relationship with [[Chibi-Usa]]. She keeps the [[Talisman|Garnet Orb]].
|
||||
|
||||
Setsuna is the oldest of the nine Sailor Senshi; in the R season, she is a college student while the others are still in grade school. Despite being the oldest, Sailor Pluto never assumes any type of official leadership role. Even among the Inner Senshi, she frequently defers to Uranus and Neptune.
|
||||
|
||||
==Forms==
|
||||
|
||||
[[File:Image004.gif|thumb|left|Sailor Pluto]]
|
||||
|
||||
===Sailor Pluto===
|
||||
Her sailor suit has a black collar, black skirt, dark red bows, black knee-high boots with white trim at the top, a black choker, and a garnet-stoned tiara. In the manga, she wears a belt with keys.
|
||||
|
||||
During the Silver Millennium, she was Princess of the planet Pluto, and Soldier of Time and Revolution. She is one of the Outer Sailor Soldiers. She also has abilities to manipulate time but was forbidden to by Chronos, god of time. While guarding the gate of time, she had a special relationship with the future Princess of Crystal Tokyo, Small Lady Serenity, and gave her Luna-P, a ball that resembled Luna that can do magic and communicate with her. When the Messiah of Silence appeared, Pluto rejoined the Outer Soldiers in the present. Her role in the founding and operation of Crystal Tokyo is not given in any of the Sailor Moon continuity although maybe in Ratio 1 as [[wikipedia:Tatsunoko vs. Capcom: Ultimate All Stars]].
|
||||
|
||||
==Transformations==
|
||||
[[File:Pluto_planet_power.gif|thumb|"Pluto Planet Power, Make Up"]]
|
||||
:Using her planet transformation stick, Setsuna transforms into Sailor Pluto
|
||||
|
||||
==Attacks==
|
||||
[[File:Dead_scream_1.gif|thumb|"Dead Scream"]]
|
||||
Dead Scream (Pluto Deadly Scream in the english dub): Her main attack. It is mainly an energy ball, but light purple. In the Japanese version, she whispers the name of the attack.
|
||||
|
||||
Time Stop: No words are actually said in this power, but Pluto stops time nonetheless.The only time she used this was when they got in a helicopter crash in Sailor Moon S to save Sailor Uranus and Sailor Neptune from the crash.
|
55
test/test_diff_revisions/test_bug_4_to
Normal file
55
test/test_diff_revisions/test_bug_4_to
Normal file
@ -0,0 +1,55 @@
|
||||
{{charabox
|
||||
|chara_name = Setsuna Meiou
|
||||
|image_filename = Sailor_Pluto-333.jpg
|
||||
|image_description_1 = Setsuna Meiou
|
||||
|image_description_2 = Setsuna Meiou
|
||||
|birthday = October 29th
|
||||
|astrosign = Scorpio
|
||||
|bloodtype = A
|
||||
|family = None
|
||||
|hobbies = Shopping
|
||||
|sports = n/a
|
||||
|color = Dark red
|
||||
|class = Biology
|
||||
|noclass = Music
|
||||
|food = Green tea
|
||||
|nofood = Eggplant
|
||||
|place = n/a
|
||||
|fortune = n/a
|
||||
|habit = Being Sick (?)
|
||||
|skill = Sewing
|
||||
|likes = n/a
|
||||
|dislikes = Cockroaches
|
||||
|dream = A fashion designer
|
||||
|motto = n/a
|
||||
|stone = [[wikipedia:Garnet|Garnet]]
|
||||
|titles = Sailor Pluto,<BR>Princess Pluto, <BR> Puu (nickname from [[Chibi-Usa]]),<BR><span style="color:green;"/span>
|
||||
}}
|
||||
|
||||
'''Meioh Setsuna '''(known as '''Trista Meioh''' in the english dub) is '''Sailor Pluto''', and she guards the gates of time. We first see her in Sailor Moon R, where she watches over [[Chibi-Usa]] in the past. She has a very special relationship with [[Chibi-Usa]]. She keeps the [[Talisman|Garnet Orb]].
|
||||
|
||||
[[File:Setsuna42.jpg|thumb|left|Setsuna, AKA Eternal Sailor Pluto, as shown in the manga.]]Setsuna is the oldest of the nine Sailor Senshi; in the R season, she is a college student while the others are still in grade school. Despite being the oldest, Sailor Pluto never assumes any type of official leadership role. Even among the Inner Senshi, she frequently defers to Uranus an[[File:Setsuna2.jpg|thumb|Setsuna.]]d Neptune.
|
||||
|
||||
Her name means 'Moment, Dead King'.
|
||||
|
||||
==Forms==
|
||||
|
||||
|
||||
|
||||
|
||||
===Sailor Pluto===
|
||||
Her sailor suit has a black collar, black skirt, dark red bows, black knee-high boots with white trim at the top, a black choker, and a garnet-stoned tiara. In the manga, she wears a belt with keys.
|
||||
|
||||
During the Silver Millennium, she was Princess of the planet Pluto, and Soldier of Time and Revolution. She is one of the Outer Sailor Soldiers. She also has abilities to manipulate time but was forbidden to by Chronos, god of time. While guarding the gate of time, she had a special relationship with the future Princess of Crystal Tokyo, Small Lady Serenity, and gave her Luna-P, a ball that resembled Luna that can do magic and communicate with her. When the Messiah of Silence appeared, Pluto rejoined the Outer Soldiers in the present. Her role in the founding and operation of Crystal Tokyo is not given in any of the Sailor Moon continuity.
|
||||
|
||||
==Transformations==
|
||||
|
||||
|
||||
|
||||
Using her planet transformation stick, Setsuna transforms into Sailor Pluto.
|
||||
|
||||
==Attacks==
|
||||
|
||||
[[File:Setsuna90.jpg|thumb|left|Setsuna, AKA Sailor Pluto, as shown in the anime.]]Dead Scream (Pluto Deadly Scream in the english dub): Her main attack. It is mainly an energy ball, but light purple. In the Japanese version, she whispers the name of the attack.
|
||||
|
||||
Time Stop: No words are actually said in this power, but Pluto stops time nonetheless.The only time she used this was when they got in a helicopter crash in Sailor Moon S to save Sailor Uranus and Sailor Neptune from the crash.
|
99
test/test_diff_revisions/test_complex_from
Normal file
99
test/test_diff_revisions/test_complex_from
Normal file
@ -0,0 +1,99 @@
|
||||
== Sailor porno ==
|
||||
[[Image:Saturn_Transforming.gif|thumb]][[Image:Example.jpg]]{{Charabox|chara_name=Usagi Tsukino
|
||||
|image_filename=Smoon.png
|
||||
|image_description_1=sailor porno as Sailor Moon
|
||||
|image_description_2=Usagi Tsukino as Sailor Dumb
|
||||
|birthday=June 30<br>(age between the ages of 35 and cunt)
|
||||
|astrosign=Cancer
|
||||
|bloodtype=Orgasm
|
||||
|family=[[Ikuko Tsukino]] (Sex parter),<BR>[[Kenji Tsukino]] (Sex Costume Designer),<BR>[[Shingo Tsukino]] (buttsecks) <BR> [[Queen Sexcapade]] <BR> (mother in the [[Moon Kingdom]])
|
||||
|hobbies=doficating
|
||||
|sports=rushing fucklette
|
||||
|color=shit brown, baby dirrahr green
|
||||
|class=Home tit fucking 1
|
||||
|noclass=sex ed, math
|
||||
|food=cum caKES
|
||||
|nofood=diapar rash
|
||||
|place=Château de Versailles
|
||||
|fortune=Usagi and Naru go to a<BR>fortune-telling house
|
||||
|habit=licks boobs in public
|
||||
|skill=pooping
|
||||
persuades people by masturbating
|
||||
|likes=White cum
|
||||
|dislikes=her cunt,<br>Fire (when left fucking around unattended for too long)
|
||||
|dream= A sex goddes
|
||||
|motto=A sleeping whore fucking fast
|
||||
|stone=[[wikipedia:Diamond|cumstone]]
|
||||
|titles= universeal sex godess, big tit sex }}
|
||||
|
||||
EPIC LULZ H4X3D by TEH GREAT yourpapamario
|
||||
|
||||
'''Usagi Tsukino'''(aka Sailor MOTHERFUCKING CUNT DIPSHIT) is one of the original five Sailor Hentai [[sailor soldiers]] and is the main character of [[some guys]]'s [[Sailor Moon]]shitty series. She is the princess of the moon, and a bit of a ditz. She has a black cat named [[Molestation kitty titties]] who is her [[guardian cat]] from the [[PORN XXX]].
|
||||
|
||||
Her name translates directly from Japanese as "moon field dipshit." This is a pun, because the character used for "field" is pronounced "hoe," which also means "fuck for a beer" in Wapanese. So her name is a pun on "I FUCK IN EXCHANGE FOR BEER," a reference to a Japanese Buddhist legend about a rabbit humping YOUR MUM, thus creating the sad little excuse for human existence that is YOU. [http://www.laputanlogic.com/articles/2004/04/05-0001.html] (Like the Western "Man in the Moon") There are many references to rabbits throughout the series.
|
||||
|
||||
==In the Hentai==
|
||||
Usagi was the first soldier introduced to us in [[Pretty Soldier Sailor Moon]]. She saved her strap on, and fell asleep at her house after crying her dick offfff. Soon after wanking, Luna explained to Usagi that she was the buttsecks of the boon, and she gave Usagi her transformation bra. Her fist time wil fuck saving someone was when she saved her fuck buddy, [[fred rogers]], from her possessed hermaphodite wank.
|
||||
|
||||
==In the Yoai==
|
||||
Usagi is the leader of the Super saggy titty Soldiers. Anime Usagi is a lot less mature than her manga counterpart. She is often found competing with [[NO U]] and has silly arguments with her poop. She grows into her role as Sailor Fuckoff, but slowly and less fully than does the Usagi of the dildo days.
|
||||
|
||||
Usagi is a douchebag, cunt, bitchy bastard prince of your mom, always eating like a regular godzilla. She grows less mature over periods of time, especially after being revealed as the god-damned buttfucking Princess, and the Future Queen of the city of the dildos, the land of OVER 9000!, the Moon fuckdom, and the Silver condom.
|
||||
|
||||
Usagi's most cherished loves are her fuck-faced buttsechs orgy friends, the Sailor Shitty, her earthly fucking family, her love and soul mate Prince douchebag, and her future daughter, YOUR TITTIES!!!!!!
|
||||
|
||||
==Forms and pornos==
|
||||
|
||||
== Headline text ==
|
||||
===Sailor BloodHound===
|
||||
In this form, Sailor Moon can perform attacks such as the almighty cumshot. Her Sailor Suit has a blue cumnet, a blue strap-on dildo, pink vajayjay and black condoms, pink buttsechs xxx doll with a white PINGAS! with a crescent-shaped top on it. Her condom is black with the crescent clitoris stimulator on it. Her boobs are also very special. They are gold, with a pink jewel and a crescent on top of it. Around the edges are four jewels, cum white, pee yellow, diarrhea green/brown, and green, symbolizing the four [[the Four Penis]] soldiers. In the Manga, she starts out wearing a white mask made of cum similar to that of Sailor slut. In addition, she ears two jewels on her boobs with a used condom with stuck cum. Her tiara has a red penish.
|
||||
|
||||
===Super Sailor Porno===
|
||||
In this form, Sailor porno can perform "Moon Gorgeous Masturbation". Her sex suit now has a orgasm blue collar with two dildo gold stripes. Her sleeves are three lacktating lavender see through condamlike sleeves. She now has barettes in her pubic hair hair along with the jewels. The barettes are three circles with fetish feathers reaching out of each anus. The emblem on her tiara is now a cunt shape. Her front bow is period red, while her back bow is cum white and massive. She has one urine yellow belt rim with a cum white wing underneath it. The belt fuckle is a copy of her boobs, which is a penis pink heart with a gold rim, two gold rings, and a gold crescent in the center. Her earrings are two gold crescents. Her cat O nine tails is now urine yellow with a pink heart jewel on it. Her skirt is cum white, with an orgASM blue stripe and a urnine yellow stripe. In the hentai, her collar is orgasm blue and gonnoriah green.
|
||||
|
||||
===Eternal sex goddes Sailor porno===
|
||||
In this form, Sailor Moon can perform "super blow me off to hell". Her asscheeks are round and pink, and they have period- red condams. Her choker strap on is red, and has a gold gay symbol jewel with a cresaunt underneath. Her front go go dialdo has been replaced with two scrotum wings, and the bra is the same as the choker jewel, only larger. Her belt is made of three ribbons: red, yellow, and blue, held together by a crescent buckle. Her skirt has three ball sacks, urine- yellow, period-red, and orgasm-blue. The scrotum bands at the top of her gloves have an oral secks on them similar to the barettes in her pubic hair, they are on like a blade would be. Also, her prostate exam gloves have two bracelets at the anus. Her earrings are a crescent with another dangling beneath it like a poop. Her tiara is gone and is replaced by herpes, like Sailor Vibrators. Her po-po boots are now semen white with a downwards penis point with a hemroid. Her back bow butt is still massive and red, but now has two long, thin dangling boobies. Finally, she now has two massive scrotum wings, and a fully erected strap on.
|
||||
|
||||
===Princess Serenity, the lesbian Princess===
|
||||
Sailor prono can transform into her past self-sucking self, Princess Sexcapade of the porno. Her powers here include humping people. Both are connected to the [[Phantom Super Chrome Dildo]] (maboroshii no ginzuishou). The crystal is a symbol of opression, which she uses to queef on people. She is the daughter of the beautiful and gay, Queen Sexcapade, queen of the porn studio in your vagina and the super chrome the kingdom unifucking all pinises of the solar sexcapade.
|
||||
|
||||
Princess Sexcapades gown (based on a sexcapade that [[Naoko Takeuchi]] once saw) has two round condams with spiral patterns on them. It is strapless, and has a gold '0rgasm' shaped pattern on the bodice. After that, a ruffle of white semen, and a section of gold pleasure beads complete the anus. The dress is of an 'erotica' cut - then there is a billowing white cumshottt. At the back, the pleasure beads have a white bow testical unlike the back bow on Super Sailor pornos sex costume. This time, however, the bow is in the middle of her backcunt, not in the small of her back. Princess Sexcapades also has bras not unlike the ones Super and SEXternal Sailor Moon wears, only they are pleaure pearls, with no period red, and have no fetish feathers. She has a crescent on her scrotum head like Sailor Vagina and SEXternal Sailor porno.
|
||||
|
||||
===Neo Queef ShittyTittys===
|
||||
As Neo Queen Shittily, Usagi rules over Crystal Take-your-quife-and-put-it-in-a-jar in the future. Her outfit is almost as shitty as when she was Princess Serenity, only the vaginal condoms have gone, there are now two rows of penishes, the dress is a bit more slutty, and the boobies are even more massive, the actual bow tied part is so massive it seems to form premature ejaculations. Now, Neo Queen Shittily has a tampon on her head, it is golden, pee-colored, has some pink testicles on it, and in the center, a variation on her brooch from when she was Super Sailor Bitch, only at the top, it has a crown-shaped frosted flake, and a ruby in the center of the heart, replacing the condom.
|
||||
|
||||
==Parallel Sailor Moon==
|
||||
|
||||
sailor mooner is shooting a porn in west city. just as she took her strap on off the evil dr. rabbit comes into rapenap her. but using the power of the universal cunt flap she squirst gamma rays from her cunt thus killing. dr. jackoff.
|
||||
|
||||
==Transformations==
|
||||
|
||||
--'''Moon Prism Power, Fuck Up!:''' Using the Moon dildo given to her by her dad, she is able to cumshot into the 1st version of Sailor Moon, her primary attack being her diarrhea, cum, and puke.
|
||||
|
||||
--'''Moon Crystal Power, Shit on this guy!:''' Using the Moon Compact given to her by her gay mother grandma, Princess Serenity she is able to transform into a stronger penis-sucking form of Sailor dildo. She then shits on the first guy she sees on the street. HAHA DISREGARD THAT, I SUCK COCKS!
|
||||
|
||||
--'''Moon Cosmic Power, I am a hermaphrodite!:''' Using the Cosmic Heart Moon Buttsechs doll created by the love of Usagi & Mamoru have. She is able to transform into the 3rd and incredibly powerful cumshotting form of your mom.
|
||||
|
||||
--'''Crisis, slut-up!:''' Using the Holy dildo of andromada galaxy to transform into Super Sailor lampoon.
|
||||
|
||||
-'''Moon Crisis, freiza-up!:''' Using her and friezas Crisis Moon Bras, they transform into Super Sailor victorian era hermaphodites.
|
||||
|
||||
--'''Moon Eternal Power, cat O nine tails :''' in this form she becomes a sex diva, and whips her enemys to death with her cat O nine tails. while licking her terds out of her anus.
|
||||
|
||||
--'''Sexcapade Moon Masturbation, Bob Saget!:''' in this form sailor porno dresses up like tourrets guy and has a feeble argument with her blow up doll, she becomes mad and yell bob saget at the top of her cunts, she then proceeds to prefore the "super blow me off to hell" technuqe, this posessing the doll and blowing it off to hell.
|
||||
|
||||
==Sepcial attacks (rape movements)==
|
||||
|
||||
taking her magical strap on, and using the magical cumshots from the gods squirts cum into enemys eyes and runs away.
|
||||
|
||||
super-slut-fuck stop motion porno: she takes her clit and drapes it over her enemys head. thus blinding them, and if shes really pissed she has her period right on them.
|
||||
|
||||
radioactive sex doll: she takes her sex doll and throws it at a hermaphodite.
|
||||
|
||||
sailor porn: she flys into the sky and strips naked to distract her enemys.
|
||||
|
||||
diariah diplomat: SHE CHARGES HER INTESTINAL ENERGY TO PRODUCE DIARIAH, THEN BENDS OVER WITH HER ASS POINTING TO HER VICTIM THEN DOFICATES DIARIAH ALL OVER THEM, WHILE DEBATING OVER THE ENVIORNMENTAL STATE.
|
||||
|
||||
DILDO DIPRIVEMENT: she steals her enemys dildo and keeps it for her own, thus making them go insane.
|
||||
|
||||
lady elaine: she dresses up elegantly and ejaculates violently and falls down the escalator. and asks the security gaurd if he has a tampon. he checks his man bag and she humps him and breaks his neck. and marks her territory with her period.
|
100
test/test_diff_revisions/test_complex_to
Normal file
100
test/test_diff_revisions/test_complex_to
Normal file
@ -0,0 +1,100 @@
|
||||
{{Charabox|chara_name=Usagi Tsukino
|
||||
|image_filename=Smoon.png
|
||||
|image_description_1=Usagi Tsukino as Sailor Moon
|
||||
|image_description_2=Usagi Tsukino as Sailor Moon
|
||||
|birthday=June 30<br>(age 30)
|
||||
|astrosign=Cancer
|
||||
|bloodtype=O
|
||||
|family=[[Ikuko Tsukino]] (mother),<BR>[[Kenji Tsukino]] (father),<BR>[[Shingo Tsukino]] (brother) <BR> [[Queen Serenity]] <BR> (mother in the [[Moon Kingdom]])
|
||||
|hobbies=Sleeping and eating
|
||||
|sports=None
|
||||
|color=Pink, white, and purple
|
||||
|class=Home economics
|
||||
|noclass=English, math
|
||||
|food=Ice cream, cake
|
||||
|nofood=Carrots
|
||||
|place=Château de Versailles
|
||||
|fortune=Usagi and Naru go to a<BR>fortune-telling house
|
||||
|habit=Smiles to cheat people
|
||||
|skill=Blackmailing,
|
||||
persuades people by crying
|
||||
|likes=White rabbits
|
||||
|dislikes=Dentists,<br>Fire (when left cooking unattended for too long)
|
||||
|dream= A bride
|
||||
|motto=A sleeping child grows fast
|
||||
|stone=[[wikipedia:Diamond|Diamond]]
|
||||
|titles=Sailor Moon,<BR>Princess Serenity,<BR>Neo-Queen Serenity }}
|
||||
|
||||
'''Usagi Tsukino'''(aka Sailor Moon) is one of the original five Sailor Senshi [[sailor soldiers]] and is the main character of [[Naoko Takeuchi]]'s [[Sailor Moon]] series. She is the princess of the moon, and a bit of a ditz. She has a black cat named [[Luna]] who is her [[guardian cat]] from the [[moon]].
|
||||
|
||||
Her name translates directly from Japanese as "moon field rabbit." This is a pun, because the character used for "field" is pronounced "no," which also means "of" in Japanese. So her name is a pun on "rabbit of the moon," a reference to a Japanese Buddhist legend about a rabbit pounding mochi on the moon. [http://www.laputanlogic.com/articles/2004/04/05-0001.html] (Like the Western "Man in the Moon") There are many references to rabbits throughout the series.
|
||||
|
||||
==In the Manga==
|
||||
Usagi was the first soldier introduced to us in [[Pretty Soldier Sailor Moon]]. She saved Luna, and fell asleep at her house after crying. Soon after waking, Luna explained to Usagi that she was the Soldier of the Moon, and she gave Usagi her transformation brooch. Her first time saving someone was when she saved her friend, [[Naru Osaka|Naru]], from her possessed mother.
|
||||
|
||||
==In the Anime==
|
||||
Usagi is the leader of the Sailor Soldiers. Anime Usagi is a lot less mature than her manga counterpart. She is often found competing with [[Rei Hino]] and has silly arguments with her. She grows into her role as Sailor Moon, but slowly and less fully than does the Usagi of the manga.
|
||||
|
||||
Usagi is a crybaby, clumsy, boy-crazy, always eating like a regular teenager. She grows more mature over periods of time, especially after being revealed as the Moon Princess, and the Future Queen of Crystal Tokyo, the Earth, the Moon Kingdom, and the Silver Millenium.
|
||||
|
||||
Usagi's most cherished loves are her friends, the Sailor Senshi, her earthly family, her love and soul mate Prince Endymion, and her future daughter Chibiusa.
|
||||
|
||||
==Forms and powers==
|
||||
===Sailor Moon===
|
||||
In this form, Sailor Moon can perform attacks such as Moon Tiara Action. Her Sailor Suit has a blue collar, a blue skirt, pink front and back bows, pink boots with a white point with a crescent-shaped jewel on it. Her choker is pink with the crescent jewel on it. Her brooch is also very special. It is gold, with a pink jewel and a crescent underneath it. Around the edges are four jewels, red, blue, a deeper gold, and green, symbolizing the four [[Soldiers of the Four Guardian Deities|Guardian]] soldiers. In the Manga, she starts out wearing a white mask similar to that of Sailor V. In addition, she ears two jewels on her buns with a white outline and a red center. Her tiara has a red jewel.
|
||||
|
||||
===Super Sailor Moon===
|
||||
In this form, Sailor Moon can perform "Moon Gorgeous Meditation". Her sailor suit now has a blue collar with two gold stripes. Her sleeves are three lavender see through winglike sleeves. She now has barettes in her hair along with the jewels. The barettes are three circles with feathers reaching out of each circle. The emblem on her tiara is now a crescent shape. Her front bow is red, while her back bow is white and massive. She has one yellow belt rim with a white wing underneath it. The belt buckle is a copy of her brooch, which is a pink heart with a gold rim, two gold rings, and a gold crescent in the center. Her earrings are two gold crescents. Her choker is now yellow with a pink heart jewel on it. Her skirt is white, with a blue stripe and a yellow stripe. In the manga, her collar is blue and green.
|
||||
|
||||
===Eternal Sailor Moon===
|
||||
In this form, Sailor Moon can perform "Silver Moon Crystal Therapy Kiss". Her sleeves are round and pink, and they have red bands. Her choker is red, and has a gold heart jewel with a crescent underneath. Her front bow has been replaced with two angel wings, and the brooch is the same as the choker jewel, only larger. Her belt is made of three ribbons: red, yellow, and blue, held together by a crescent buckle. Her skirt has three tiers, yellow, red, and blue. The bands at the top of her gloves have an ornament on them similar to the barettes in her hair, they are on like a blade would be. Also, her gloves have two bracelets at the wrists. Her earrings are a crescent with another dangling beneath it. Her tiara is gone and is replaced by a crescent, like Sailor V's. Her boots are now white with a downwards red point with a crescent jewel. Her back bow is still massive and red, but now has two long, thin dangling ribbons. Finally, she now has two massive angel wings, fully active.
|
||||
|
||||
===Princess Serenity, the Moon Princess===
|
||||
Sailor Moon can transform into her past self, Princess Serenity of the Moon. Her powers here include healing people. Both are connected to the [[Phantom Silver Crystal]] (maboroshii no ginzuishou). The crystal is a symbol of her soul, which she uses to save people. She is the daughter of the beautiful and fair, Queen Serenity, queen of the Moon Kingdom and the Silver Millenium the kingdom uniting all planets of the solar system.
|
||||
|
||||
Princess Serenity's gown (based on a wedding dress that [[Naoko Takeuchi]] once saw) has two round sleeves with spiral patterns on them. It is strapless, and has a gold '0' shaped pattern on the bodice. After that, a ruffle of white, and a section of gold beads complete the top. The dress is of an 'empire' cut - then there is a billowing white skirt. At the back, the beads have a white bow not unlike the back bow on Super Sailor Moon's outfit. This time, however, the bow is in the middle of her back, not in the small of her back. Princess Serenity also has barettes not unlike the ones Super and Eternal Sailor Moon wears, only they are pearls, with no red, and have no feathers. She has a crescent on her forehead head like Sailor V and Eternal Sailor Moon.
|
||||
|
||||
===Neo Queen Serenity===
|
||||
As Neo Queen Serenity, Usagi rules over Crystal Tokyo in the future. Her outfit is almost the same as when she was Princess Serenity, only the sleeves have gone, there are now two rows of beads, the dress is a bit more slinky, and the bows are even more massive, the actual bow tied part is so massive it seems to form wings. Now, Neo Queen Serenity has a tiara on her head, it is golden, has some pink jewels on it, and in the center, a variation on her brooch from when she was Super Sailor Moon, only at the top, it has a crown-shaped jewel, and a ruby in the center of the heart, replacing the crescent.
|
||||
|
||||
==Parallel Sailor Moon==
|
||||
|
||||
In [[Parallel Sailor Moon]], the parody story created for the [[Materials Collection]], Usagi is the mother to two children, [[Kousagi Tsukino]] and [[Usagi Small Lady Serenity Tsukino|ChibiUsa Tsukino]]. She is much the same as she was in the rest of the manga, ditzy and forgetful and a crybaby but with a big heart.
|
||||
|
||||
==Transformations==
|
||||
|
||||
--'''Moon Prism Power, Make Up!:''' Using the Moon Locket given to her by Luna, she is able to transform into the 1st version of Sailor Moon, her primary attack being her Moon Tiara.
|
||||
|
||||
--'''Moon Crystal Power, Make Up!:''' Using the Moon Compact given to her by her Mother, Princess Serenity she is able to transform into a stronger form of Sailor Moon.
|
||||
|
||||
--'''Moon Cosmic Power, Make Up!:''' Using the Cosmic Heart Moon Broach created by the love of Usagi & Mamoru have. She is able to transform into the 3rd and incredibly powerful form of Sailor Moon.
|
||||
|
||||
--'''Crisis, Make-up!:''' Using the Holy Grail to transform into Super Sailor Moon.
|
||||
|
||||
-'''Moon Crisis, Make-up!:''' Using her and Chibiusa's Crisis Moon Broaches, they transform into Super Sailors.
|
||||
|
||||
--'''Moon Eternal Power, Make-Up!:''' Using the Moon Article, she transforms into her strongest form next to Neo-Queen Serenity.
|
||||
|
||||
==Powers==
|
||||
|
||||
--Moon Tiara Action: Using her tiara, she uses her tiara to turn the enemy into "moon dust". (Called Moon Tiara magic in the english dub by Dic)
|
||||
|
||||
--Moon Tiara Stardust: Used to throw moon dust from her tiara to un-hypnotize brainwashed human.
|
||||
|
||||
--Moon Healing Escalation: Using the Moon Stick she heals the Rainbow Crystal Carriers and turns them back into regular humans, destroying the Shadow Warriors of the Dark Kingdom. (Called Moon Healing activation in the english dub)
|
||||
|
||||
--Cosmic Moon Power: Using the Moon stick, she mounts the Silver Crystal ontop of it, and uses this power to destroy enemies.
|
||||
|
||||
--Moon Princess Elimination: Using the Moon Scepter she uses this powerful attack as the Moon Princess to destroy Negative Forces.
|
||||
|
||||
--Moon Spiral Heart Attack: Using the Spiral Heart Moon Rod or Scepter she uses this attack to destroy Heart Snatchers and turn them back into what they were and destroy the Daimon Pod. and other Negative Forces.
|
||||
|
||||
-- Rainbow Moon Heart Ace: As Super Sailor Moon, she can use a more powerful attack of the one above, to destroy the Heart Snatcher's new daimon.
|
||||
|
||||
--Super Moon Target: Using Pegasus Power, and the Moon Kaleidascope she destroys the Amazon Trio's lemure.
|
||||
|
||||
--Moon Gorgeous Meditation: Using the Moon Kaleidascope she is able to destroy the Amazon Quartet's lemure.
|
||||
|
||||
--Starlight Honeymoon Therapy Kiss: Using her new Eternal Tiare she defeats Queen Nehelenia, and phony zombified Sailor Soldiers.
|
||||
|
||||
--Silver Moon Crystal Power Kiss: Using extra power from Sailor ChibiChibi Moon she destroy phony Sailor Soldiers and heals Star Seeds.
|
50
test/test_diff_revisions/test_highlight_3_from
Normal file
50
test/test_diff_revisions/test_highlight_3_from
Normal file
@ -0,0 +1,50 @@
|
||||
{{Charabox|chara_name=Usagi Tsukino
|
||||
|image_filename=Smoon.png
|
||||
|image_description_1=Usagi Tsukino as Sailor Moon
|
||||
|image_description_2=Usagi Tsukino as Sailor Moon
|
||||
|birthday=June 30
|
||||
|astrosign=Cancer
|
||||
|bloodtype=O
|
||||
|family=[[Ikuko Tsukino]] (mother),<BR>[[Kenji Tsukino]] (father),<BR>[[Shingo Tsukino]] (brother)
|
||||
|hobbies=Sleeping and eating
|
||||
|sports=None
|
||||
|color=Pink and white
|
||||
|class=Home economics
|
||||
|noclass=English, math
|
||||
|food=Ice cream, cake
|
||||
|nofood=Carrots
|
||||
|place=Château de Versailles
|
||||
|fortune=Usagi and Naru go to a<BR>fortune-telling house
|
||||
|habit=Smiles to cheat people
|
||||
|skill=Blackmailing,
|
||||
persuades people by cying
|
||||
|likes=White rabbits
|
||||
|dislikes=Dentists
|
||||
|motto=A sleeping child grows fast
|
||||
|stone=Diamond
|
||||
|titles=Sailor Moon,<BR>Princess Serenity,<BR>Neo-Queen Serenity}}
|
||||
|
||||
'''Usagi Tsukino'''(aka Sailor Moon) is one of the original five [[sailor soldiers]] and is the main character of [[Naoko Takeuchi]]'s [[Sailor Moon]] series. She is the princess of the moon, and a bit of a ditz. She has a black cat named [[Luna]] who is her [[guardian cat]] from the [[moon]].
|
||||
|
||||
==In the Manga==
|
||||
Usagi was the first soldier introduced to us in [[Pretty Guardian Sailor Moon]]. She saved Luna, and fell asleep at her house after crying. Soon after waking, Luna explained to Usagi that she was the Soldier of the Moon, and she gave Usagi her transformation brooch. Her first time saving someone was when she saved her friend, Naru, from her mother, who was posessed.
|
||||
|
||||
==In the Anime==
|
||||
Usagi is the leader of the Sailor Soldiers. Anime Usagi is a lot less mature than her manga counterpart. She is often found competing with [[Rei Hino]] and has silly arguments with her. She grows into her role as Sailor Moon, but slowly and less fully than does the Usagi of the manga.
|
||||
|
||||
==Forms==
|
||||
===Sailor Moon===
|
||||
In this form, Sailor Moon can perform attacks such as Moon Tiara Action. Her Sailor Suit has a blue collar, a blue skirt, red front and back bows, red boots with a white point with a crescent-shaped jewel on it. Her choker is red with the crescent jewel on it. Her brooch is also very special. It is gold, with a pink jewel and a crescent underneath it. Around the edges are four jewels, red, blue, a deeper gold, and green, symbolizing the four [[Guardian]] soldiers. In the Manga, she starts out wearing a white mask similar to that of Sailor V. In addition, she ears two jewels on her buns with a white outline and a red center. Her tiara has a red jewel.
|
||||
|
||||
===Super Sailor Moon===
|
||||
In this form, Sailor Moon can perform "Moon Gorgeous Meditation". Her sailor suit now has a blue collar with two gold stripes. Her sleeves are three lavender see through winglike sleeves. She now has barettes in her hair along with the jewels. The barettes are three circles with feathers reaching out of each circle. The emblem on her tiara is now a crescent shape. Her front bow is red, while her back bow is white and massive. She has one yellow belt rim with a white wing underneath it. The belt buckle is a copy of her brooch, which is a pink heart with a gold rim, two gold rings, and a gold crescent in the center. Her earrings are two gold crescents. Her choker is now yellow with a pink heart jewel on it. Her skirt is white, with a blue stripe and a yellow stripe. In the manga, her collar is blue and green.
|
||||
|
||||
===Eternal Sailor Moon===
|
||||
In this form, Sailor Moon can perform "Silver Moon Crystal Power Kiss". Her sleeves are round and pink, and they have red bands. Her choker is red, and has a gold heart jewel with a crescent underneath. Her front bow has been replaced with two angel wings, and the brooch is the same as the choker jewel, only larger. Her belt is made of three ribbons: red, yellow, and blue, held together by a crescent buckle. Her skirt has three tiers, yellow, red, and blue. The bands at the top of her gloves have an ornament on them similar to the barettes in her hair, they are on like a blade would be. Also, her gloves have two bracelets at the wrists. Her earrings are a crescent with another dangling beneath it. Her tiara is gone and is replaced by a crescent, like Sailor V's. Her boots are now white with a downwards red point with a crescent jewel. Her back bow is still massive and red, but now has two long, thin dangling ribbons. Finally, she now has two massive angel wings, fully active.
|
||||
|
||||
===Princess Serenity, the Moon Princess===
|
||||
Sailor Moon can transform into her past self, Princess Serenity of the Moon. Her powers here include healing people and giving up her life to save people. Both are connected to the Silver Crystal, or as it is called in Japan, the "ginzuishou". The crystal is a symbol of her soul, which she uses to save people.
|
||||
Princess Serenity's gown has two round sleeves with spiral patterns on them. It is strapless and has a gold '0' shaped pattern on the bodice. After that, a little bit of white, and a section of gold beads complete the top. Then there is a billowing white dress. At the back, the beads have a white bow not unlike the back bow on Super Sailor Moon's outfit. This time, however, the bow is in the middle of her back, not on the small of her back. Princess Serenity also has barettes not unlike the ones Super and Eternal Sailor Moon wears, only they are pearls and have no feathers. She has a crescent on her head like Sailor V and Eternal Sailor Moon.
|
||||
|
||||
===Neo Queen Serenity===
|
||||
As Neo Queen Serenity, Usagi guards over Crystal Tokyo in the future. Her outfit is almost the same as when she was Princess Serenity, only the sleeves have gone, there are now two rows of beads, the dress is a bit more slinky, and the bows are even more massive, the actual bow tied part is so massive it seems to form wings. Now, Neo Queen Serenity has a tiara on her head, it is golden, has some pink jewels on it, and in the center, a variation on her brooch from when she was Super Sailor Moon, only at the top, it has a crown-shaped jewel, and a ruby in the center of the heart, replacing the crescent.
|
57
test/test_diff_revisions/test_highlight_3_to
Normal file
57
test/test_diff_revisions/test_highlight_3_to
Normal file
@ -0,0 +1,57 @@
|
||||
{{Charabox|chara_name=Usagi Tsukino
|
||||
|image_filename=Smoon.png
|
||||
|image_description_1=Usagi Tsukino as Sailor Moon
|
||||
|image_description_2=Usagi Tsukino as Sailor Moon
|
||||
|birthday=June 30
|
||||
|astrosign=Cancer
|
||||
|bloodtype=O
|
||||
|family=[[Ikuko Tsukino]] (mother),<BR>[[Kenji Tsukino]] (father),<BR>[[Shingo Tsukino]] (brother)
|
||||
|hobbies=Sleeping and eating
|
||||
|sports=None
|
||||
|color=Pink and white
|
||||
|class=Home economics
|
||||
|noclass=English, math
|
||||
|food=Ice cream, cake
|
||||
|nofood=Carrots
|
||||
|place=Château de Versailles
|
||||
|fortune=Usagi and Naru go to a<BR>fortune-telling house
|
||||
|habit=Smiles to cheat people
|
||||
|skill=Blackmailing,
|
||||
persuades people by cying
|
||||
|likes=White rabbits
|
||||
|dislikes=Dentists
|
||||
|motto=A sleeping child grows fast
|
||||
|stone=Diamond
|
||||
|titles=Sailor Moon,<BR>Princess Serenity,<BR>Neo-Queen Serenity}}
|
||||
|
||||
'''Usagi Tsukino'''(aka Sailor Moon) is one of the original five [[sailor soldiers]] and is the main character of [[Naoko Takeuchi]]'s [[Sailor Moon]] series. She is the princess of the moon, and a bit of a ditz. She has a black cat named [[Luna]] who is her [[guardian cat]] from the [[moon]].
|
||||
|
||||
Her name translates directly from Japanese as "moon field rabbit." This is a pun, because the character used for "field" is pronounced "no," which also means "of" in Japanese. So her name is a pun on "rabbit of the moon," a reference to a Japanese legend about a rabbit pounding mochi on the moon. There are many references to rabbits throughout the series.
|
||||
|
||||
==In the Manga==
|
||||
Usagi was the first soldier introduced to us in [[Pretty Guardian Sailor Moon]]. She saved Luna, and fell asleep at her house after crying. Soon after waking, Luna explained to Usagi that she was the Soldier of the Moon, and she gave Usagi her transformation brooch. Her first time saving someone was when she saved her friend, Naru, from her mother, who was posessed.
|
||||
|
||||
==In the Anime==
|
||||
Usagi is the leader of the Sailor Soldiers. Anime Usagi is a lot less mature than her manga counterpart. She is often found competing with [[Rei Hino]] and has silly arguments with her. She grows into her role as Sailor Moon, but slowly and less fully than does the Usagi of the manga.
|
||||
|
||||
==Forms==
|
||||
===Sailor Moon===
|
||||
In this form, Sailor Moon can perform attacks such as Moon Tiara Action. Her Sailor Suit has a blue collar, a blue skirt, red front and back bows, red boots with a white point with a crescent-shaped jewel on it. Her choker is red with the crescent jewel on it. Her brooch is also very special. It is gold, with a pink jewel and a crescent underneath it. Around the edges are four jewels, red, blue, a deeper gold, and green, symbolizing the four [[Guardian]] soldiers. In the Manga, she starts out wearing a white mask similar to that of Sailor V. In addition, she ears two jewels on her buns with a white outline and a red center. Her tiara has a red jewel.
|
||||
|
||||
===Super Sailor Moon===
|
||||
In this form, Sailor Moon can perform "Moon Gorgeous Meditation". Her sailor suit now has a blue collar with two gold stripes. Her sleeves are three lavender see through winglike sleeves. She now has barettes in her hair along with the jewels. The barettes are three circles with feathers reaching out of each circle. The emblem on her tiara is now a crescent shape. Her front bow is red, while her back bow is white and massive. She has one yellow belt rim with a white wing underneath it. The belt buckle is a copy of her brooch, which is a pink heart with a gold rim, two gold rings, and a gold crescent in the center. Her earrings are two gold crescents. Her choker is now yellow with a pink heart jewel on it. Her skirt is white, with a blue stripe and a yellow stripe. In the manga, her collar is blue and green.
|
||||
|
||||
===Eternal Sailor Moon===
|
||||
In this form, Sailor Moon can perform "Silver Moon Crystal Power Kiss". Her sleeves are round and pink, and they have red bands. Her choker is red, and has a gold heart jewel with a crescent underneath. Her front bow has been replaced with two angel wings, and the brooch is the same as the choker jewel, only larger. Her belt is made of three ribbons: red, yellow, and blue, held together by a crescent buckle. Her skirt has three tiers, yellow, red, and blue. The bands at the top of her gloves have an ornament on them similar to the barettes in her hair, they are on like a blade would be. Also, her gloves have two bracelets at the wrists. Her earrings are a crescent with another dangling beneath it. Her tiara is gone and is replaced by a crescent, like Sailor V's. Her boots are now white with a downwards red point with a crescent jewel. Her back bow is still massive and red, but now has two long, thin dangling ribbons. Finally, she now has two massive angel wings, fully active.
|
||||
|
||||
===Princess Serenity, the Moon Princess===
|
||||
Sailor Moon can transform into her past self, Princess Serenity of the Moon. Her powers here include healing people. Both are connected to the Phantom Silver Crystal (maboroshii no ginzuishou). The crystal is a symbol of her soul, which she uses to save people.
|
||||
|
||||
Princess Serenity's gown has two round sleeves with spiral patterns on them. It is strapless and has a gold '0' shaped pattern on the bodice. After that, a ruffle of white, and a section of gold beads complete the top. Then there is a billowing white dress. At the back, the beads have a white bow not unlike the back bow on Super Sailor Moon's outfit. This time, however, the bow is in the middle of her back, not on the small of her back. Princess Serenity also has barettes not unlike the ones Super and Eternal Sailor Moon wears, only they are pearls and have no feathers. She has a crescent on her forehead head like Sailor V and Eternal Sailor Moon.
|
||||
|
||||
===Neo Queen Serenity===
|
||||
As Neo Queen Serenity, Usagi guards over Crystal Tokyo in the future. Her outfit is almost the same as when she was Princess Serenity, only the sleeves have gone, there are now two rows of beads, the dress is a bit more slinky, and the bows are even more massive, the actual bow tied part is so massive it seems to form wings. Now, Neo Queen Serenity has a tiara on her head, it is golden, has some pink jewels on it, and in the center, a variation on her brooch from when she was Super Sailor Moon, only at the top, it has a crown-shaped jewel, and a ruby in the center of the heart, replacing the crescent.
|
||||
|
||||
==Parallel Sailor Moon==
|
||||
|
||||
In [[Parallel Sailor Moon]], the parody story created for the [[Materials Collection]], Usagi is the mother to two children, [[Kousagi Tsukino]] and [[Usagi Small Lady Serenity Tsukino|ChibiUsa Tsukino]]. She is much the same as she was in the rest of the manga, ditzy and forgetful and a crybaby but with a big heart.
|
18
test/test_diff_revisions/test_highlight_4_from
Normal file
18
test/test_diff_revisions/test_highlight_4_from
Normal file
@ -0,0 +1,18 @@
|
||||
The following is a list of all templates. If you create a template, please list it here.
|
||||
|
||||
==Stubs==
|
||||
|
||||
{{charastub}}
|
||||
|
||||
==Spoiler==
|
||||
|
||||
{{spoiler}}
|
||||
|
||||
==Other==
|
||||
|
||||
{{seealso}}
|
||||
{{charabox}}
|
||||
{{shortcut}}
|
||||
{{sandbox}}
|
||||
|
||||
[[Category: About Sailor Moon Wiki|L]]
|
18
test/test_diff_revisions/test_highlight_4_to
Normal file
18
test/test_diff_revisions/test_highlight_4_to
Normal file
@ -0,0 +1,18 @@
|
||||
The following is a list of all templates. If you create a template, please list it here.
|
||||
|
||||
==Stubs==
|
||||
|
||||
<nowiki>{{charastub}}</nowiki>
|
||||
|
||||
==Spoiler==
|
||||
|
||||
<nowiki>{{spoiler}}</nowiki>
|
||||
|
||||
==Other==
|
||||
|
||||
<nowiki>{{shortcut}}
|
||||
{{seealso}}
|
||||
{{charabox}}
|
||||
{{sandbox}}</nowiki>
|
||||
|
||||
[[Category: About Sailor Moon Wiki|L]]
|
69
test/test_diff_revisions/test_leading_ws_from
Normal file
69
test/test_diff_revisions/test_leading_ws_from
Normal file
@ -0,0 +1,69 @@
|
||||
{{Charabox|chara_name=Lita Kino
|
||||
|image_filename=Sailorjupiter.jpg
|
||||
|image_description_1={{PAGENAME}}
|
||||
|image_description_2={{PAGENAME}}
|
||||
|birthday=December 5<BR>(age 30)
|
||||
|astrosign=Sagittarius
|
||||
|bloodtype=O
|
||||
|family= Orphaned
|
||||
|hobbies=Cooking,<BR> Shopping,<BR> reading romance novels,<BR> Award-winning Actress,<BR> Host on Japan's game show on [[wikipedia:TV Asahi|TV Asahi's]] <BR>''[[wikipedia:Russian Roulette (game show)|Russian Roulette]]''
|
||||
|sports= Martial arts
|
||||
|color= Sugar pink, <BR> green
|
||||
|class= Home Economics, <BR> History
|
||||
|noclass= Physics
|
||||
|food= Cherry pie, <br> Meatloaf
|
||||
|nofood= None
|
||||
|place= [[wikipedia:New York City|New York City]],<br>[[wikipedia:Hollywood, Los Angeles, California|Hollywood]],<br>[[wikipedia:Las Vegas, Nevada|Las Vegas]]
|
||||
|fortune=
|
||||
|habit= Obsesses over boys,<BR> Extinguishing Fires
|
||||
|skill= Cooking, <BR> strong,<BR> athletic
|
||||
|likes= Horse
|
||||
|dislikes= Airplanes, <BR> Cheaters, <BR> Fire (when left cooking unattended for too long)
|
||||
|dream= A bride, <BR> to own a bakery/florists'
|
||||
|motto= "Melts in your mouth, not in your hand."
|
||||
|stone=[[wikipedia:Emerald|Emerald]]
|
||||
|titles=Sailor Jupiter, Princess Jupiter,<BR>Kelly Landry}}
|
||||
|
||||
'''Makoto Kino''' is the [[Sailor Senshi]] of Jupiter. Her name means "Sincerity of Wood". [[wikipedia:Five_elements (Chinese philosophy)|Wood]], in Chinese astrology, represents strength and flexibility. She is very tall for her age, and studies the martial arts. She is very independant, as she was orphaned at an early age and has had to take care of herself.Her parents died in a plane crash,so thats why she's scared of planes.She sees herself as a protector, even before she became a [[sailor soldier]]. She is also curiously vulnerable - due to her need to take care of herself, she didn't have many close friends, until [[Usagi Tsukino]] offered to sit with her.
|
||||
|
||||
One of her quirks is that she is always obsessing over boys, who all look "just like" her old boyfriend.
|
||||
|
||||
|
||||
==Forms==
|
||||
|
||||
|
||||
|
||||
===Sailor Jupiter===
|
||||
|
||||
[[Image:sailorjupiter]]
|
||||
Her sailor suit has a dark green collar, dark green skirt, sugar pink front bow, sugar pink back bow, dark green small boots, a dark green choker with a gold star, and a green-stoned tiara. She wears pink rose-shaped earrings, and a special hairtie with two green round balls on it.
|
||||
|
||||
===Princess Jupiter===
|
||||
During the Silver Millenium, she was the ruler of the planet Jupiter. She is the Sailor Soldier of Nature & Strength.
|
||||
|
||||
===Queen Jupiter===
|
||||
She is now Ruler of the Planet Jupiter [[wikipedia:Jupiter|Jupiter]].
|
||||
|
||||
|
||||
|
||||
==Transformations==
|
||||
|
||||
Jupiter Power! (Make Up!): Using her 1st transformation pen, Lita transformed into the 1st version of Sailor Jupiter. Used from Sailor Moon Classic through to the Sailor Moon R Pt.2.
|
||||
|
||||
Jupiter Star Power! (Make Up!): Using her 2nd Star Transformation Power Stick to transform into the 2nd version of Sailor Jupiter, with stronger powers. Used from Sailor Moon R Pt. 2 to the middle of Sailor Moon SuperS.
|
||||
|
||||
Jupiter Crystal Power! (Make Up!): Using her 3rd Crystal and Rod given to her by Pegasus she transforms into Super Sailor Jupiter the 3rd and final form of Jupiter in the anime.
|
||||
|
||||
==Attacks==
|
||||
|
||||
*Supreme Thunder: Blasting powerful Thunderbolts to crush the enemy.
|
||||
|
||||
*Supreme Thunder Dragon: An even more powerful version of Supreme Thunder, she creates a dragon out of thunder.
|
||||
|
||||
*Sparkling Wide Pressure: Creating a bolt of electricity and thunder. (A Less powerful version was called "Jupiter Thundercloud Zap")
|
||||
|
||||
*Jupiter Oak Evolution: Blasting beams of light with the strength of an oak tree.
|
||||
|
||||
|
||||
{{charastub}}
|
||||
[[Category:Sailor soldiers]]
|
98
test/test_diff_revisions/test_leading_ws_to
Normal file
98
test/test_diff_revisions/test_leading_ws_to
Normal file
@ -0,0 +1,98 @@
|
||||
{{Charabox|chara_name=Lita Kino
|
||||
|image_filename=Sailorjupiter.jpg
|
||||
|image_description_1={{PAGENAME}}
|
||||
|image_description_2={{PAGENAME}}
|
||||
|birthday=December 5<BR>(age 30)
|
||||
|astrosign=Sagittarius
|
||||
|bloodtype=O
|
||||
|family= Orphaned
|
||||
|hobbies=Cooking,<BR> Shopping,<BR> reading romance novels,<BR> Award-winning Actress,<BR> Host on Japan's game show on [[wikipedia:TV Asahi|TV Asahi's]] <BR>''[[wikipedia:Russian Roulette (game show)|Russian Roulette]]''
|
||||
|sports= Martial arts
|
||||
|color= Sugar pink, <BR> green
|
||||
|class= Home Economics, <BR> History
|
||||
|noclass= Physics
|
||||
|food= Cherry pie, <br> Meatloaf
|
||||
|nofood= None
|
||||
|place= [[wikipedia:New York City|New York City]],<br>[[wikipedia:Hollywood, Los Angeles, California|Hollywood]],<br>[[wikipedia:Las Vegas, Nevada|Las Vegas]]
|
||||
|fortune=
|
||||
|habit= Obsesses over boys,<BR> Extinguishing Fires
|
||||
|skill= Cooking, <BR> strong,<BR> athletic
|
||||
|likes= Horse
|
||||
|dislikes= Airplanes, <BR> Cheaters, <BR> Fire (when left cooking unattended for too long)
|
||||
|dream= A bride, <BR> to own a bakery/florists'
|
||||
|motto= "Melts in your mouth, not in your hand."
|
||||
|stone=[[wikipedia:Emerald|Emerald]]
|
||||
|titles=Sailor Jupiter, Princess Jupiter,<BR>Kelly Landry}}
|
||||
|
||||
|
||||
|
||||
'''Makoto Kino''' is the [[Sailor Senshi]] of Jupiter. Her name means "Sincerity of Wood". [[wikipedia:Five_elements (Chinese philosophy)|Wood]], in Chinese astrology, represents strength and flexibility. She is very tall for her age, and studies the martial arts. She is very independant, as she was orphaned at an early age and has had to take care of herself. Her parents died in a plane crash, so thats why she's scared of planes. She sees herself as a protector, even before she became a [[sailor soldier]]. She is also curiously vulnerable - due to her need to take care of herself, she didn't have many close friends, until [[Usagi Tsukino]] offered to sit with her.
|
||||
|
||||
|
||||
One of her quirks is that she is always obsessing over boys, who all look "just like" her old boyfriend.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
==Forms==
|
||||
|
||||
|
||||
|
||||
|
||||
===Sailor Jupiter===
|
||||
|
||||
|
||||
[[Image:sailorjupiter]]
|
||||
|
||||
|
||||
Her sailor suit has a dark green collar, dark green skirt, sugar pink front bow, sugar pink back bow, dark green small boots, a dark green choker with a gold star, and a green-stoned tiara. She wears pink rose-shaped earrings, and a special hairtie with two green round balls on it.
|
||||
|
||||
|
||||
|
||||
===Princess Jupiter===
|
||||
|
||||
During the Silver Millenium, she was the ruler of the planet Jupiter. She is the Sailor Soldier of Nature & Strength.
|
||||
|
||||
|
||||
|
||||
===Queen Jupiter===
|
||||
|
||||
She is now Ruler of the Planet Jupiter [[wikipedia:Jupiter|Jupiter]].
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
==Transformations==
|
||||
|
||||
|
||||
Jupiter Power! (Make Up!): Using her 1st transformation pen, Lita transformed into the 1st version of Sailor Jupiter. Used from Sailor Moon Classic through to the Sailor Moon R Pt.2.
|
||||
|
||||
|
||||
Jupiter Star Power! (Make Up!): Using her 2nd Star Transformation Power Stick to transform into the 2nd version of Sailor Jupiter, with stronger powers. Used from Sailor Moon R Pt. 2 to the middle of Sailor Moon SuperS.
|
||||
|
||||
|
||||
Jupiter Crystal Power! (Make Up!): Using her 3rd Crystal and Rod given to her by Pegasus she transforms into Super Sailor Jupiter the 3rd and final form of Jupiter in the anime.
|
||||
|
||||
|
||||
|
||||
==Attacks==
|
||||
|
||||
|
||||
*Supreme Thunder: Blasting powerful Thunderbolts to crush the enemy.
|
||||
|
||||
|
||||
*Supreme Thunder Dragon: An even more powerful version of Supreme Thunder, she creates a dragon out of thunder.
|
||||
|
||||
|
||||
*Sparkling Wide Pressure: Creating a bolt of electricity and thunder. (A Less powerful version was called "Jupiter Thundercloud Zap")
|
||||
|
||||
|
||||
*Jupiter Oak Evolution: Blasting beams of light with the strength of an oak tree.
|
||||
|
||||
|
||||
|
||||
{{charastub}}
|
||||
[[Category:Sailor soldiers]]
|
32
test/test_diff_revisions/test_unicode_highlight_from
Normal file
32
test/test_diff_revisions/test_unicode_highlight_from
Normal file
@ -0,0 +1,32 @@
|
||||
{{Charabox|chara_name=Usagi Tsukino
|
||||
|image_filename=Smoon.png
|
||||
|image_description_1=Usagi Tsukino as Sailor Moon
|
||||
|image_description_2=Usagi Tsukino as Sailor Moon
|
||||
|birthday=June 30
|
||||
|astrosign=Cancer
|
||||
|bloodtype=O
|
||||
|family=[[Ikuko Tsukino]] (mother),
|
||||
|
||||
[[Kenji Tsukino]] (father),
|
||||
|
||||
[[Shingo Tsukino]] (brother)
|
||||
|hobbies=Sleeping and eating
|
||||
|sports=None
|
||||
|color=Pink and white
|
||||
|class=Home economics
|
||||
|noclass=English, math
|
||||
|food=Ice cream, cake
|
||||
|nofood=Carrots
|
||||
|place=Palace of Versailles
|
||||
|fortune=A fortune-telling house
|
||||
|habit=Cries to get what she wants
|
||||
|skill=Crying, sleeping
|
||||
|likes=White rabbits
|
||||
|dislikes=Dentists
|
||||
|motto=A sleeping child grows fast
|
||||
|stone=Diamond
|
||||
|titles=Sailor Moon,
|
||||
|
||||
Princess Serenity,
|
||||
|
||||
Neo-Queen Serenity}}
|
34
test/test_diff_revisions/test_unicode_highlight_to
Normal file
34
test/test_diff_revisions/test_unicode_highlight_to
Normal file
@ -0,0 +1,34 @@
|
||||
{{Charabox|chara_name=Usagi Tsukino
|
||||
|image_filename=Smoon.png
|
||||
|image_description_1=Usagi Tsukino as Sailor Moon
|
||||
|image_description_2=Usagi Tsukino as Sailor Moon
|
||||
|birthday=June 30
|
||||
|astrosign=Cancer
|
||||
|bloodtype=O
|
||||
|family=[[Ikuko Tsukino]] (mother),
|
||||
|
||||
[[Kenji Tsukino]] (father),
|
||||
|
||||
[[Shingo Tsukino]] (brother)
|
||||
|hobbies=Sleeping and eating
|
||||
|sports=None
|
||||
|color=Pink and white
|
||||
|class=Home economics
|
||||
|noclass=English, math
|
||||
|food=Ice cream, cake
|
||||
|nofood=Carrots
|
||||
|place=Château de Versailles
|
||||
|fortune=Usagi and Naru go to a
|
||||
fortune-telling house
|
||||
|habit=Smiles to cheat people
|
||||
|skill=Blackmailing,
|
||||
persuades people by cying
|
||||
|likes=White rabbits
|
||||
|dislikes=Dentists
|
||||
|motto=A sleeping child grows fast
|
||||
|stone=Diamond
|
||||
|titles=Sailor Moon,
|
||||
|
||||
Princess Serenity,
|
||||
|
||||
Neo-Queen Serenity}}
|
68
test/test_diff_revisions/test_unmatched_parmoves_from
Normal file
68
test/test_diff_revisions/test_unmatched_parmoves_from
Normal file
@ -0,0 +1,68 @@
|
||||
{{charabox |chara_name=Haruka Ten'ou
|
||||
|image_filename=Uranus10.jpg
|
||||
|image_description_1=Haruka Ten'ou as Sailor Uranus
|
||||
|image_description_2=
|
||||
|birthday=January 27
|
||||
|astrosign=Aquarius
|
||||
|bloodtype=B
|
||||
|family= Girlfriend Michiru/Sailor Neptune<BR/> Changed to cousin 'Michelle' in English<BR/> dub of the anime
|
||||
|hobbies=Car racing<BR/> Driving<BR/> Track and field<BR/> Playing the piano<BR/> Flirting with pretty girls
|
||||
|sports=Car racing
|
||||
|color=Gold
|
||||
|class=Physical education
|
||||
|noclass= Modern Japanese
|
||||
|food=Salad
|
||||
|nofood=Nattou
|
||||
|place=
|
||||
|fortune=
|
||||
|habit= flirting with pretty girls
|
||||
|skill=Fawning
|
||||
|likes=Panda
|
||||
|dislikes= confessions of love
|
||||
|dream= To become a professional racer
|
||||
|motto=
|
||||
|stone=[[wikipedia:Amber|Amber]]
|
||||
|titles=Sailor Uranus,<BR>Princess Uranus}}
|
||||
|
||||
'''Haruka Ten'ou''' ('''Amara Ten'ou''' in the English dub) better known as '''Sailor Uranus''' is one of the [[Outer Soldiers]]. She is the Keeper of the Space Sword.
|
||||
|
||||
Haruka is formally introduced in the [[Sailor Moon S]] story arc, although she appears in silhouette alongside Sailor Neptune in the final [[Sailor Moon R]] episode, which acted as a "teaser" to Sailor Moon S.
|
||||
|
||||
Haruka is older than the Inner Senshi, already in high school when the Inner Soldiers are still in junior high. She originally attended the private Mugen School, along with Michuru and Hotaru. She is very tomboyish and has a love of speed; she runs track and races many kinds of vehicles. She can be deeply suspicious of others and can often appear cold in this regard, although she will strongly defend anyone who has earned her trust.
|
||||
|
||||
As a Sailor Soldier, Uranus' tactics (along with Neptune's) can be controversial and morally ambiguous, which puts her at odds with Sailor Moon and the other inner Senshi - particularly since they can frequently involve sacrificing lives. This includes willing to let the Death Buster's victims die if their Heart Crystals were the ones they were searching for, wanting to kill Hotaru because she had the Sovereign of Silence within her and betraying Saturn and Pluto in an attempt to join with Galaxia and then double-cross her.
|
||||
|
||||
===Her relationship with Sailor Neptune===
|
||||
In the original manga, Sailor Neptune and Sailor Uranus were lovers. In the Japanese anime, this was the same. However, in the dub, it was decided to change their relationship to that of cousins, as it was considered too controversial for a children's show. Some have hypothesized that in the [[Moon Kingdom]], Sailor Uranus was a man ("Prince Uranus"), and was reincarnated as female
|
||||
(thus making Haruka and Michiru's relationship "''really'' heterosexual"), but this has been refuted by [[Naoko Takeuchi]]. Some characterize Haruka as being the dominant personality in the relationship, although it could be argued that Michiru has Haruka wrapped around her finger.
|
||||
|
||||
Even though they are lovers, they have agreed that they will sacrifice each other if necessary for their mission.
|
||||
|
||||
Due to the controversial nature of their relationship, Haruka and Michiru were introduced in the dub as cousins, a fact reinforced by others that technically should not have known to begin with. But despite that, their flirty banter is mostly kept intact throughout the season.
|
||||
|
||||
In the final season of Sailor Stars (which has yet to be dubbed and most likely never will), their relationship has stepped up a level from banter to almost explicitly physical in nature and no amount of dubbing would be able to change that. Part of the reason why Sailor Moon S took so long to come out was because the dubbers had to work hard to conceal their relationship.
|
||||
|
||||
==In the Manga==
|
||||
Haruka in the manga is a swift change from Haruka in the anime, as she is shown wearing both feminine and masculine clothing. When she wears masculine clothes, her appearance is sharper to help make the distinction.
|
||||
|
||||
==In the Anime==
|
||||
Haruka is introduced in the S season of the anime, although a silhouette of her and Sailor Neptune appeared in the previous season.
|
||||
Due to her masculine dress style, Haruka is more often than not mistaken for a boy initially, as evidenced by Usagi and Minako, despite the former already having a boyfriend and future husband they are added in [[wikipedia:Tatsunoko vs. Capcom: Ultimate All Stars]].
|
||||
|
||||
==Forms and Powers==
|
||||
===Sailor Uranus===
|
||||
|
||||
Uranus Planet Power! (Make Up!): Transformation phrase used during Sailor Moon S to transform into Sailor Uranus.
|
||||
|
||||
Like her fellow Outers, Sailor Uranus is a lot more mature and almost never seen without her partner Sailor Neptune. Uranus is also arguably the strongest of the Senshi, her physical hits generally doing a lot more damage than any of the others. Makoto is possibly Haruka's match in physical strength, as it seemed as though Haruka had won, she was injured by Makoto, who was injured herself.
|
||||
|
||||
In temperament, Uranus is generally more quick to act than to sit and think and along with the other Outers, is somewhat cold to the younger Senshi, mostly due to the Outers being the first line of defense in protecting the solar system.
|
||||
|
||||
In a strange animation quirk, her special attack, World Shaking, looks like a ground attack, despite the fact that Uranus is the Sky Senshi.
|
||||
|
||||
Uranus' special weapon is the Space Sword.
|
||||
|
||||
Uranus' first uniform upgrade came in the first episode of the last season, Sailor Stars.
|
||||
|
||||
|
||||
{{charastub}}
|
68
test/test_diff_revisions/test_unmatched_parmoves_to
Normal file
68
test/test_diff_revisions/test_unmatched_parmoves_to
Normal file
@ -0,0 +1,68 @@
|
||||
[[File:Esuesvmanga.jpg|thumb|left|Haruka, AKA Eternal Sailor Uranus, as shown in the manga.]]{{charabox
|
||||
|chara_name = Haruka Ten'ou
|
||||
|image_filename = Uranus10.jpg
|
||||
|image_description_1 = Haruka Ten'ou as Sailor Uranus
|
||||
|birthday = January 27th
|
||||
|astrosign = Aquarius
|
||||
|bloodtype = B
|
||||
|family = Girlfriend Michiru/Sailor Neptune<BR/> Changed to cousin 'Michelle' in English<BR/> dub of the anime
|
||||
|hobbies = Driving
|
||||
|sports = Car racing
|
||||
|color = Gold
|
||||
|class = Physical education
|
||||
|noclass = Modern History
|
||||
|food = Salad
|
||||
|nofood = Nattou (fermented soy beans)
|
||||
|place = n/a
|
||||
|fortune = n/a
|
||||
|habit = Flirting with pretty girls
|
||||
|skill = Racing
|
||||
|likes = n/a
|
||||
|dislikes = Confessions of love
|
||||
|dream = To become a professional racer
|
||||
|motto = n/a
|
||||
|stone = [[wikipedia:Amber|Amber]]
|
||||
|titles = Sailor Uranus,<BR>Princess Uranus
|
||||
}}
|
||||
|
||||
'''Ten'ou Haruka/Tenoh Haruka '''('''Amara Ten'ou''' in the English dub) better known as '''Sailor Uranus''' is one of the [[Outer Soldiers]]. She is the Keeper of the Space Sword.
|
||||
|
||||
Haruka is formally introduced in the [[Sailor Moon S]] story arc, although she appears in silhouette alongside Sailor Neptune in the final [[Sailor Moon R]] episode, which acted as a "teaser" to Sailor Moon S.
|
||||
|
||||
Haruka is older than the Inner Senshi, already in high school when the Inner Soldiers are still in junior high. She originally attended the private Mugen School, along with Michuru and Hotaru. She is very tomboyish and has a love of speed; she runs track and races many kinds of vehicles. She can be deeply suspicious of others and can often appear cold in this regard, although she will strongly defend anyone who has earned her trust.
|
||||
|
||||
As a Sailor Soldier, Uranus' tactics (along with Neptune's) can be controversial and morally ambiguous, which puts her at odds with Sailor Moon and the other inner Senshi - particularly since they can frequently involve sacrificing lives. This includes willing to let the Death Buster's victims die if their Heart Crystals were the ones they were searching for, wanting to kill Hotaru because she had the Sovereign of Silence within her and betraying Saturn and Pluto in an attempt to join with Galaxia and then double-cross her.
|
||||
|
||||
Haruka's name means 'Far Sky King', although her attacks do not exactly reflect this.
|
||||
|
||||
===Her relationship with Sailor Neptune===
|
||||
In the original manga, Sailor Neptune and Sailor Uranus were lovers. In the Japanese anime, this was the same. However, in the dub, it was decided to change their relationship to that of cousins, as it was considered too controversial for a children's show. Some have hypothesized that in the [[Moon Kingdom]], Sailor Uranus was a man ("Prince Uranus"), and was reincarnated as female
|
||||
(thus making Haruka and Michiru's relationship "''really'' heterosexual"), but this has been refuted by [[Naoko Takeuchi]]. Some characterize Haruka as being the dominant personality in the relationship, although it could be argued that Michiru has Haruka wrapped around her finger.
|
||||
|
||||
Even though they are lovers, they have agreed that they will sacrifice each other if necessary for their mission.
|
||||
|
||||
Due to the controversial nature of their relationship, Haruka and Michiru were introduced in the dub as cousins, a fact reinforced by others that technically should not have known to begin with. But despite that, their flirty banter is mostly kept intact throughout the season.
|
||||
|
||||
In the final season of Sailor Stars (which has yet to be dubbed and most likely never will), their relationship has stepped up a level from banter to almost explicitly physical in nature and no amount of dubbing would be able to change that. Part of the reason why Sailor Moon S took so long to come out was because the dubbers had to work hard to conceal their relationship.
|
||||
|
||||
==In the Manga==
|
||||
Haruka in the manga is a swift change from Haruka in the anime, as she is shown wearing both feminine and masculine clothing. When she wears masculine clothes, her appearance is sharper to help [[File:Haruka221.jpg|thumb|left|Haruka.]]make the distinction.
|
||||
|
||||
==In the Anime==
|
||||
Haruka is introduced in the S season of the anime, although a silhouette of her and Sailor Neptune appeared in the previous season.
|
||||
Due to her masculine dress style, Haruka is more often than not mistaken for a boy initially, as evidenced by Usagi and Minako, despite the former already having a boyfriend and future husband they are added in [[wikipedia:Tatsunoko vs. Capcom: Ultimate All Stars]].[[File:Haruka97.jpg|thumb|Haruka, AKA Sailor Uranus, as shown in the anime.]]
|
||||
|
||||
==Forms and Powers==
|
||||
===Sailor Uranus===
|
||||
|
||||
Uranus Planet Power! (Make Up!): Transformation phrase used during Sailor Moon S to transform into Sailor Uranus.
|
||||
|
||||
Like her fellow Outers, Sailor Uranus is a lot more mature and almost never seen without her partner Sailor Neptune. Uranus is also arguably the strongest of the Senshi, her physical hits generally doing a lot more damage than any of the others. Makoto is possibly Haruka's match in physical strength, as it seemed as though Haruka had won, she was injured by Makoto, who was injured herself.
|
||||
|
||||
In temperament, Uranus is generally more quick to act than to sit and think and along with the other Outers, is somewhat cold to the younger Senshi, mostly due to the Outers being the first line of defense in protecting the solar system.
|
||||
|
||||
In a strange animation quirk, her special attack, World Shaking, looks like a ground attack, despite the fact that Uranus is the Sky Senshi.
|
||||
|
||||
Uranus' special weapon is the Space Sword.
|
||||
|
||||
Uranus' first uniform upgrade came in the first episode of the last season, Sailor Stars.
|
75
test/test_diff_revisions/test_whitespace_bug_from
Normal file
75
test/test_diff_revisions/test_whitespace_bug_from
Normal file
@ -0,0 +1,75 @@
|
||||
{{charabox
|
||||
|chara_name = Minako Aino
|
||||
|image_filename = Venus7.jpg
|
||||
|image_description_1 = Minako Aino as Sailor Venus
|
||||
|image_description_2 = Minako Aino as Sailor Venus
|
||||
|birthday = 22nd October
|
||||
|astrosign = Libra
|
||||
|bloodtype = B
|
||||
|family = mother, father
|
||||
|hobbies = reading comics
|
||||
|sports = volleyball
|
||||
|color = yellow, red
|
||||
|class = physical education, English
|
||||
|noclass = everything else
|
||||
|food = curry rice
|
||||
|nofood = Shiitake mushrooms
|
||||
|habit = forgets things, easily angered
|
||||
|skill = fawning
|
||||
|dislikes = mum and [[wikipedia:Law enforcement in Japan|police officers]]
|
||||
|dream = To be an idol
|
||||
|motto = If you fall down, lift yourself up!
|
||||
|stone = topaz
|
||||
|titles = Sailor V, Sailor Venus, Princess Venus
|
||||
}}''' Minako Aino''' (愛野 美奈子, ''Aino Minako; ''known simply as '''Mina Aino''' in the english adaptations) better known as '''Sailor Venus''' is one of the original five [[sailor soldiers]] & the leader of the Inner Sailor Soldiers and was in fact the first sailor soldier created by [[Naoko Takeuchi]]. She is extremely cheerful and more or less [[Usagi Tsukino|Usagi]]'s best friend. She has a white cat named [[Artemis]] who is her [[guardian cat]] from the [[Silver Millennium|moon]].
|
||||
|
||||
==In the manga==
|
||||
Minako starred in her own manga series before [[Pretty Soldier Sailor Moon]]. This manga series was called [[Codename: Sailor V]] and detailed her adventures as Sailor V.
|
||||
|
||||
When Sailor V appeared to the soldiers, she announced herself as their [[Princess Serenity|princess]]. It is revealed later that she is, in fact, not the moon princess but the leader of her [[Soldiers of the Four Guardian Deities|guardians]]. She said she was the moon princess to act as a decoy and protect Usagi.
|
||||
|
||||
==In the anime==
|
||||
Originally, Sailor Venus was Sailor V in England. She fought crime there with Artemis. She had two friends, Alan and Katarina. Minako fell in love with Alan, but Alan and Katarina fell in love and she left England for Japan again. She soon found the [[sailor soldiers]], and saved them from [[Zoisite]]. She soon after assumed the title of Sailor Venus.
|
||||
|
||||
Minako is almost as ditzy as Usagi but knows when to stop. She comes to term as the Leader of the Sailors. Her dream is to be an idol.
|
||||
|
||||
==Forms==
|
||||
|
||||
[[File:Vartmswink.jpg|thumb|Sailor V in the manga]]
|
||||
|
||||
===Sailor V===
|
||||
|
||||
In this form, Sailor V can perform "Crescent Beam." She wears an outfit similar to the [[sailor suit]], with a blue collar, red cap sleeves with blue cuffs, sholder guards, gloves with orange elbow pads, a red bow, chest armor, an exposed midriff, a blue skirt with a red line along the bottom and blue high heels. She also wears a red and white mask which looks like a flamboyant pair of red glasses. She has a crescent moon on her forehead (similar to [[Princess Serenity]]'s) and a white choker with a crescent moon.
|
||||
|
||||
===Sailor Venus===
|
||||
|
||||
In this form, Sailor Venus can perform many attacks including "Venus Love-Me Chain", among others. Her sailor suit has a orange collar, orange skirt, blue front bow, yellow back bow, orange high heels,an orange choker, and an orange-stoned tiara. In the manga, there is a chain around her waist which she uses to perform her attacks.
|
||||
|
||||
===Super Sailor Venus===
|
||||
In this form, Sailor Venus can use the attack "Venus Love and Beauty Shock". There are no very apparent changes to her uniform, but her yellow back bow grows longer, and her brooch turns into a heart-shape. Her choker gains a star jewel on it another variant were added on [[wikipedia:Tatsunoko vs. Capcom: Ultimate All Stars]].
|
||||
|
||||
===Sailor Star Venus (manga-only)===
|
||||
In this form, Sailor Venus gains round yellow sleeves with two orange bands holding them together. Her belt becomes two strips of ribbon, one yellow, one orange, held together by a star jewel, like the one on her choker.Her skirt now has two tiers, the top orange, the bottom yellow. The back ribbons become huge at the bow with two skinny ribbons hanging down. Her boots are tall and white, in the style of Sailor Moon's and Mercury's, only the point is down and orange. The point is held by a star jewel. Her brooch also changes from a heart-shaped jewel to a star-shaped jewel. She loses her tiara, and on her forehead is the symbol for Venus.
|
||||
|
||||
===Princess Venus===
|
||||
In the past during the Silver Millennium, she was Princess Venus, ruler of the planet Venus. As Sailor Venus, she is the leader of the Sailor Soldiers, guardians of Princess Serenity, and soldier of Love and Beauty.
|
||||
|
||||
===Queen Venus===
|
||||
There is no canon information that supports any of the Planetary Princesses are Queens in the 30th century beyond Neo Queen Serenity.
|
||||
|
||||
==Transformations==
|
||||
|
||||
|
||||
|
||||
*Crescent Power: Using the Crescent Moon Broach, she transforms into heroine, Sailor V.
|
||||
*Venus Power, Make Up!: Using her transformation pen, Minako transformed into the 1st form of Sailor Venus. Used from Sailor Moon Classic through to the Sailor Moon R Pt.2.
|
||||
*Venus Star Power, Make Up!: Using her 2nd Star Transformation Power Stick to transform into the 2nd form of Sailor Venus, with stronger powers. Used from Sailor Moon R Pt. 2 to the middle of Sailor Moon SuperS.
|
||||
*Venus Crystal Power, Make Up!: Using her 3rd Crystal and Rod given to her by Pegasus she transforms into Super Sailor Venus the 3rd and final form of Venus in the anime.
|
||||
*Venus Eternal Power, Make Up!: Her very last transformation that was only shown in the manga, no one knows why it wasn't in the anime.
|
||||
|
||||
==Powers==
|
||||
*Crescent Beam: Creating a powerful light beam.
|
||||
*Crescent Beam Shower: A more powerful form of her crescent beam, she blasts multipile beams.
|
||||
*Venus Love-Me Chain : Creating a heart shaped chain that can harness, attack, and be used as a whip. ( called Love-Chain Encircle in English Anime)
|
||||
*Venus Love & Beauty Shock: Creating a multiple heart shaped lights that combine into one powerful attack.
|
||||
[[Category:Usagi Tsukino and her Friends]]
|
81
test/test_diff_revisions/test_whitespace_bug_to
Normal file
81
test/test_diff_revisions/test_whitespace_bug_to
Normal file
@ -0,0 +1,81 @@
|
||||
{{charabox
|
||||
|
||||
|chara_name = Minako Aino
|
||||
|image_filename = Venus7.jpg
|
||||
|image_description_1 = Minako Aino as Sailor Venus
|
||||
|image_description_2 = Minako Aino as Sailor Venus
|
||||
|birthday = October 22nd
|
||||
|astrosign = Libra
|
||||
|bloodtype = B
|
||||
|family = Mother
|
||||
|hobbies = Chasing idols
|
||||
|sports = Volleyball
|
||||
|color = Yellow, Red
|
||||
|class = Physical Education
|
||||
|noclass = Math, English
|
||||
|food = Curry
|
||||
|nofood = Shiitake mushrooms
|
||||
|place = n/a
|
||||
|fortune = n/a
|
||||
|habit = Easily forgetful
|
||||
|skill = Playing
|
||||
|likes = n/a
|
||||
|dislikes = Her mother, and policemen
|
||||
|dream = To be an idol
|
||||
|motto = If you fall down, lift yourself up!
|
||||
|stone = Ttopaz
|
||||
|titles = Sailor V, Sailor Venus, Princess Venus
|
||||
}}'''Aino Minako''' (愛野 美奈子, ''Aino Minako; ''known simply as '''Mina Aino''' in the english adaptations) better known as '''Sailor Venus''' is one of the original five [[sailor soldiers]] & the leader of the Inner Sailor Soldiers and was in fact the first sailor soldier created by [[Naoko Takeuchi]]. She is extremely cheerful and more or less [[Usagi Tsukino|Usagi]]'s best friend. She has a white cat named [[Artemis]] who is her [[guardian cat]] from the [[Silver Millennium|moon]].
|
||||
|
||||
Her name means 'Beautiful Little Child of Love', and her attacks are based around love, with the exception of Venus Crescent Beam.
|
||||
|
||||
==In the manga==
|
||||
Minako starred in her own manga series before [[Pretty Soldier Sailor Moon]]. This manga series was called [[Codename: Sailor V]] and detailed her adventures as Sailor V.
|
||||
|
||||
When Sailor V appeared to the soldiers, she announced herself as their [[Princess Serenity|princess]]. It is revealed later that she is, in fact, not the moon princess but the leader of her [[Soldiers of the Four Guardian Deities|guardians]]. She said she was the moon princess to act as a decoy and protect Usagi.
|
||||
|
||||
==In the anime==
|
||||
Originally, Sailor Venus was Sailor V in England. She fought crime there with Artemis. She had two friends, Alan and Katarina. Minako fell in love with Alan, but Alan and Katarina fell in love and she le[[File:Mina103.jpg|thumb|left|Minako, AKA Sailor Venus, as shown in the anime.]]ft England for Japan again. She soon found the [[sailor soldiers]], and saved them from [[Zoisite]]. She soon after assumed the title of Sailor Venus.
|
||||
|
||||
Minako is almost as ditzy as Usagi but knows when to stop. She comes to term as the Leader of the Sailors. Her dream is to be an idol.
|
||||
|
||||
==Forms==
|
||||
|
||||
[[File:Vartmswink.jpg|thumb|Sailor V in the manga]]
|
||||
|
||||
===Sailor V===
|
||||
|
||||
In this form, Sailor V can perform "Crescent Beam." She wears an outfit similar to the [[sailor suit]], with a blue collar, red cap sleeves with blue cuffs, sholder guards, gloves with orange elbow pads, a red bow, chest armor, an exposed midriff, a blue skirt with a red line along the bottom and blue high heels. She also wears a red and white mask which looks like a flamboyant pair of red glasses. She has a crescent moon on her forehead (similar to [[Princess Serenity]]'s) and a white choker with a crescent moon.
|
||||
|
||||
===Sailor Venus===
|
||||
|
||||
In this form, Sailor Venus can perform many attacks including "Venus Love-Me Chain", among others. Her sailor suit has a orange collar, orange skirt, blue front bow, yellow back bow, orange high heels,an orange choker, and an orange-stoned tiara. In the manga, there is a chain around her waist which she uses to perform her attacks.
|
||||
|
||||
===Super Sailor Venus===
|
||||
In this form, Sailor Venus can use the attack "Venus Love and Beauty Shock". There are no very apparent changes to her uniform, but her yellow back bow grows longer, and her brooch turns into a heart-shape. Her choker gains a star jewel on it another variant were added on [[wikipedia:Tatsunoko vs. Capcom: Ultimate All Stars]].
|
||||
|
||||
===Sailor Star Venus (manga-only)===
|
||||
In this form, Sailor Venus gains round yellow sleeves with two orange bands holding them together. Her belt becomes two strips of ribbon, one yellow, one orange, held together by a star jewel, like the one on her choker.Her skirt now has two tiers, the top orange, the bottom yellow. The back ribbons become huge at the bow with two skinny ribbons hanging down. Her boots are tall and white, in the style of Sailor Moon's and Mercury's, only the point is down and orange. The point is held by a star jewel. Her brooch also changes from a heart-shaped jewel to a star-shaped jewel. She loses her tiara, and on her forehead is the symbol for Venus.
|
||||
|
||||
===Princess Venus===
|
||||
In the past during the Silver Millennium, she was Princess Venus, ruler of the planet Venus. As Sailor Venus, she is the leader of the Sailor Soldiers, guardians of Princess Serenity, and soldier of Love and Beauty.
|
||||
|
||||
===Queen Venus===
|
||||
There is no canon information that supports any of the Planetary Princesses are Queens in the 30th century beyond Neo Queen Serenity.
|
||||
|
||||
==Transformations==
|
||||
|
||||
|
||||
|
||||
*Crescent Power: Using the Crescent Moon Broach, she transforms into heroine, Sailor V.
|
||||
*Venus Power, Make Up!: Using her transformation pen, Minako transformed into the 1st form of Sailor Venus. Used from Sailor Moon Classic through to the Sailor Moon R Pt.2.
|
||||
*Venus Star Power, Make Up!: Using her 2nd Star Transformation Power Stick to transform into the 2nd form of Sailor Venus, with stronger powers. Used from Sailor Moon R Pt. 2 to the middle of Sailor Moon SuperS.
|
||||
*Venus Crystal Power, Make Up!: Using her 3rd Crystal and Rod given to her by Pegasus she transforms into Super Sailor Venus the 3rd and final form of Venus in the anime.
|
||||
*Venus Eternal Power, Make Up!: Her very last transformation that was only shown in the manga, no one knows why it wasn't in the anime.
|
||||
|
||||
==Powers==
|
||||
*Crescent Beam: Creating a powerful light beam.
|
||||
*Crescent Beam Shower: A more powerful form of her crescent beam, she blasts multipile beams.
|
||||
*Venus Love-Me Chain : Creating a heart shaped chain that can harness, attack, and be used as a whip. ( called Love-Chain Encircle in English Anime)
|
||||
*Venus Love & Beauty Shock: Creating a multiple heart shaped lights that combine into one powerful attack.
|
||||
[[Category:Usagi Tsukino and her Friends]]
|
Loading…
Reference in New Issue
Block a user