From 5aea8d94864b7dc3a1a83be70797b48e9da26c4f Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Fri, 8 Feb 2013 00:12:11 -0300 Subject: [PATCH 01/14] Added Jubileena Signed-off-by: Pablo Lezaeta --- CHANGELOG | 4 ++-- dev/pony-checklist | 1 + manuals/ponysay.texinfo | 2 +- ponies/jubileena.pony | 46 +++++++++++++++++++++++++++++++++++++++++ ponyquotes/ponies | 1 + 5 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 ponies/jubileena.pony diff --git a/CHANGELOG b/CHANGELOG index d8ae9c53..dbbfaebe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,8 @@ Version 3.0 New ponies: amira, babseed, bear, beautybrass, bigmacsleep, billneigh, cadancecrystal, cloudchaser, descent, - featherweight, fiddlesticks, flitter, haakim, halfbakedapple, hayseed, lighningdust, midnightstrike, mrbreezy, - orangebird, orangefrog, pinkiecrazyface, raccoon, rarityelite, ravenearth, ravenunicorn, royalunicornguard, + featherweight, fiddlesticks, flitter, haakim, halfbakedapple, hayseed, lighningdust, jubileena, midnightstrike, + mrbreezy, orangebird, orangefrog, pinkiecrazyface, raccoon, rarityelite, ravenearth, ravenunicorn, royalunicornguard, rumble, shiningarmorcrystal, sombra, spikecrystal, squirrel, sweetcream (comic), trixieamulet, twilightcrystal, twinkleshine diff --git a/dev/pony-checklist b/dev/pony-checklist index 81b9186d..da6f6ba3 100644 --- a/dev/pony-checklist +++ b/dev/pony-checklist @@ -170,6 +170,7 @@ Jeff "The Dude" Letrotski JesΓΊs PezuΓ±a Jim Beam http://images4.wikia.nocookie.net/__cb20120227215231/mlp/images/thumb/6/67/Construction_worker_i-beam_s02e08.png/150px-Construction_worker_i-beam_s02e08.png John Bull http://images3.wikia.nocookie.net/__cb20110403103440/mlp/images/thumb/5/52/Second_engineer_pony_pulling_locomotive_S1E21.jpg/150px-Second_engineer_pony_pulling_locomotive_S1E21.jpg +Jubileena Junebug Karat http://images3.wikia.nocookie.net/__cb20120212144739/mlp/images/thumb/0/01/Unnamed_Jeweller_Pony_S2E17.png/150px-Unnamed_Jeweller_Pony_S2E17.png Kazooie http://images2.wikia.nocookie.net/__cb20111213200348/mlp/images/0/0a/Kazooie.png diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index d3e9fd19..ea0fba30 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -2918,7 +2918,7 @@ sequences. @itemize @bullet @item New ponies: @file{amira}, @file{babseed}, @file{bear}, @file{beautybrass}, @file{bigmacsleep}, @file{billneiigh}, -@file{cadancecrystal}, @file{cloudchaser}, @file{descent}, @file{haakim}, @file{halfbakedapple}, @file{hayseed}, +@file{cadancecrystal}, @file{cloudchaser}, @file{descent}, @file{haakim}, @file{halfbakedapple}, @file{hayseed}, @file{jubileena}, @file{featherweight}, @file{fiddlesticks}, @file{flitter}, @file{lighningdust}, @file{midnightstrike}, @file{mrbreezy}, @file{orangebird}, @file{orangefrog}, @file{pinkiecrazyface}, @file{raccoon}, @file{rarity}, @file{ravenearth}, @file{ravenunicorn}, @file{royalunicornguard}, @file{rumble}, @file{shiningarmorcrystal}, @file{sombra}, @file{spikecrystal}, diff --git a/ponies/jubileena.pony b/ponies/jubileena.pony new file mode 100644 index 00000000..27b50ef3 --- /dev/null +++ b/ponies/jubileena.pony @@ -0,0 +1,46 @@ +$$$ +APPEARANCE: S03E03 So Many Pinkie Pies +BALLOON: top +BASED ON: Generation 1 Cherries Jubilee +COAT: orange +DISPLAY: full, left +EYE: purple +FREE: no +GROUP: mare +KIND: earth +LINK: regular +MANE: teal +NAME: (not mentioned) +OTHER NAMES: Jubileena(unofficial) +POSE: stand +SOURCE: [jristz] +WIDTH: 44 +HEIGHT: 25 + + +$$$ +$balloon3$ +$\$ + $\$ + $\$ + β–„β–€β–€β–€β–„β–„β–„  + β–€β–„β–„ β–€β–„  + β–„β–€β–€ β–„ β–€ β–„ β–„β–„β–„  +    β–€β–„β–„ β–€β–„    β–„β–€β–„  +β–€β–„β–€     β–€β–€ β–€β–€      + β–„β–„β–„ β–€β–„β–„β–„β–€β–„ β–„β–€β–„  +       β–„β–„ β–„β–€   β–„β–„β–„β–€β–€β–€β–„  +    β–„   β–„ β–€β–„   β–„β–„β–€β–€ β–„β–„β–„β–€β–„β–„  +  β–„β–€ β–„β–„ β–€ β–„β–€ β–„β–€ β–„β–€ β–€β–„ β–€β–„  + β–€β–„    β–€β–„ β–„β–€ β–„β–€β–€β–€β–„β–„ β–€β–„    + β–€β–€β–€β–€β–€    β–„ β–„ β–€β–„β–„β–„β–„β–€β–€  β–€β–„ β–„     +     β–„   β–€β–„β–€  β–„ β–€β–„ β–„β–€ β–€   + β–€β–„ β–€ β–€β–„β–€ β–€ β–€   β–„β–€ β–„      + β–€β–„   β–„β–€ β–„β–€ β–„   β–„β–€  + β–„ β–€ β–€β–€β–€β–€ β–€  β–„   β–„β–€β–„β–„β–€ β–„β–€  +       β–€β–„β–€    β–€     + β–„β–€β–„β–€             β–„ β–€β–„  +            β–€β–„β–€  β–€β–„ β–€β–„  + β–„  β–„β–€         β–€β–„  β–€β–„β–„β–€  +  β–€β–€     β–€β–€    β–€  +  β–€β–€β–€β–€   β–€β–€β–€β–€   diff --git a/ponyquotes/ponies b/ponyquotes/ponies index b8ac4285..da3e0828 100644 --- a/ponyquotes/ponies +++ b/ponyquotes/ponies @@ -97,6 +97,7 @@ ironwill+ironwillwalk jeffletroski jesuspezuna joe+joetuxedo +jubileena junebug laflour lemonhearts From 93f0166f0abda0f39ac2da036f1a1716700310e1 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Fri, 8 Feb 2013 01:12:09 -0300 Subject: [PATCH 02/14] Fix a litle of credits Signed-off-by: Pablo Lezaeta --- ponies/mrsparkle.pony | 2 +- ponies/spikecrystal.pony | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ponies/mrsparkle.pony b/ponies/mrsparkle.pony index dc752dd4..3812fdd7 100644 --- a/ponies/mrsparkle.pony +++ b/ponies/mrsparkle.pony @@ -12,7 +12,7 @@ MANE: blue NAME: (not mentioned) OTHER NAMES: Night Light (unofficial), Mr Sparkle, Crescent Sparkle (unofficial) POSE: stand -SOURCE: (Bot-chan) Desktop ponies, [jristz] (ponysay 2.8) +SOURCE: (Bot-chan, Anonycat) Desktop ponies, [jristz] (ponysay 2.8) WIDTH: 40 HEIGHT: 25 diff --git a/ponies/spikecrystal.pony b/ponies/spikecrystal.pony index bca5fbe7..4d6aa6ee 100644 --- a/ponies/spikecrystal.pony +++ b/ponies/spikecrystal.pony @@ -12,7 +12,7 @@ MANE: green MASTER: spike NAME: Spike POSE: crystal -SOURCE: [jristz] +SOURCE: [jristz], based on (anonycat) Desktop ponies WIDTH: 30 HEIGHT: 20 From 6548d29c462843fb1e5725e13ea881d5761d8116 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Sat, 9 Feb 2013 00:19:56 -0300 Subject: [PATCH 03/14] Added source to lunafly Signed-off-by: Pablo Lezaeta --- ponies/lunafly.pony | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ponies/lunafly.pony b/ponies/lunafly.pony index 837aa138..68c3d712 100644 --- a/ponies/lunafly.pony +++ b/ponies/lunafly.pony @@ -14,7 +14,7 @@ MASTER: luna NAME: Luna OTHER NAMES: Princess Luna (official, full name), Lunija (official, russian), Nightmare Moon (official, corrupted), Woona (unofficial) POSE: fly -SOURCE: (unknown) +SOURCE: (Starly) Desktop ponies WIDTH: 85 HEIGHT: 40 From 3f345731c946a2fc7409694d19bebbe502aafc59 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Sun, 10 Feb 2013 08:58:34 -0300 Subject: [PATCH 04/14] Steven Magnet is canon now Signed-off-by: Pablo Lezaeta --- ponies/stevenmagnet.pony | 2 +- ponies/stevenmagnettrue.pony | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ponies/stevenmagnet.pony b/ponies/stevenmagnet.pony index 3d464a62..9289aa50 100644 --- a/ponies/stevenmagnet.pony +++ b/ponies/stevenmagnet.pony @@ -10,7 +10,7 @@ KIND: animal LINK: regular MANE: orange NAME: (not mentioned) -OTHER NAMES: Sea Serpent (official, in merchandise), Steven Magnet (unofficial), River Serpent (stated by the crew) +OTHER NAMES: Sea Serpent (official, in merchandise), Steven Magnet (official, on toy line), River Serpent (stated by the crew) POSE: idle SOURCE: (StarStep) Desktop ponies WIDTH: 78 diff --git a/ponies/stevenmagnettrue.pony b/ponies/stevenmagnettrue.pony index 71fea70b..ec52f60e 100644 --- a/ponies/stevenmagnettrue.pony +++ b/ponies/stevenmagnettrue.pony @@ -10,7 +10,7 @@ KIND: animals LINK: regular MANE: orange NAME: (not mentioned) -OTHER NAMES: Sea Serpent (official, in merchandise), Steven Magnet (unofficial), River Serpent (stated by the crew) +OTHER NAMES: Sea Serpent (official, in merchandise), Steven Magnet (official, on toy line), River Serpent (stated by the crew) POSE: true SOURCE: (StarStep) Desktop ponies WIDTH: 77 From 413ace27eb4c4df2c6237e296307f9f81767cfc9 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Sat, 16 Feb 2013 18:01:51 -0300 Subject: [PATCH 05/14] SPOILER, Added certain magical purple pony Signed-off-by: Pablo Lezaeta --- CHANGELOG | 2 +- manuals/ponysay.texinfo | 2 +- ponies/twilightprincess.pony | 49 ++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 ponies/twilightprincess.pony diff --git a/CHANGELOG b/CHANGELOG index dbbfaebe..505a83e8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ Version 3.0 featherweight, fiddlesticks, flitter, haakim, halfbakedapple, hayseed, lighningdust, jubileena, midnightstrike, mrbreezy, orangebird, orangefrog, pinkiecrazyface, raccoon, rarityelite, ravenearth, ravenunicorn, royalunicornguard, rumble, shiningarmorcrystal, sombra, spikecrystal, squirrel, sweetcream (comic), trixieamulet, twilightcrystal, - twinkleshine + twilightprincess, twinkleshine New extraponies: gleamingshield, johndelancie, orion, pipsqueak (without pirate suit), pizzapony, tempo diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index ea0fba30..70d9b1b3 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -2922,7 +2922,7 @@ New ponies: @file{amira}, @file{babseed}, @file{bear}, @file{beautybrass}, @fil @file{featherweight}, @file{fiddlesticks}, @file{flitter}, @file{lighningdust}, @file{midnightstrike}, @file{mrbreezy}, @file{orangebird}, @file{orangefrog}, @file{pinkiecrazyface}, @file{raccoon}, @file{rarity}, @file{ravenearth}, @file{ravenunicorn}, @file{royalunicornguard}, @file{rumble}, @file{shiningarmorcrystal}, @file{sombra}, @file{spikecrystal}, -@file{squirrel}, @file{sweetcream} (comic), @file{twilightcrystal}, @file{trixieamulet}, @file{twinkleshine} +@file{squirrel}, @file{sweetcream} (comic), @file{trixieamulet}, @file{twilightcrystal}, @file{twilightprincess}, @file{twinkleshine} @item New extraponies: @file{gleamingshield}, @file{johndelancie}, @file{orion}, @file{pipsqueak}, @file{pizzapony}, @file{tempo} @item diff --git a/ponies/twilightprincess.pony b/ponies/twilightprincess.pony new file mode 100644 index 00000000..4d727311 --- /dev/null +++ b/ponies/twilightprincess.pony @@ -0,0 +1,49 @@ +$$$ +APPEARANCE: S01E01 Friendship is Magic [Part 1] +AURA: purple (whitish lilac in season 1) +BALLOON: top +COAT: purple +DISPLAY: full, left +EYE: purple +FREE: no +GROUP: mare, mane, toyal +KIND: alicorn +LINK: regular +MANE: purple +NAME: Twilight +OTHER NAMES: Twilight Sparkle (official, full name), Princess Twilight Sparkle (Official, with tittle) +POSE: princess +SOURCE: [jristz], based on (pixelheart) Desktop ponies +WIDTH: 39 +HEIGHT: 28 + + +$$$ +$balloon6$ + $\$ + $\$ + $\$ + β–„β–„β–„  + β–„β–€ β–„β–€β–€β–„  +  β–„ β–„ β–„β–€β–„β–€β–„  + β–„β–„β–„β–„β–„β–„β–„β–„ β–„β–€ β–€ β–„β–„β–„ β–„β–„  + β–„β–€ β–„β–„β–€β–€β–€β–„ β–„β–„β–€β–„β–„β–€β–€β–„ β–„β–„    β–„     +  β–€β–„ β–„β–€β–€β–„β–€  β–„ β–€  β–„β–€β–„ β–„β–„ β–€ β–„β–„ β–€β–€ β–„β–€  + β–€  β–€β–€β–€β–€β–€β–€ β–„          β–„ β–€ β–„ β–€  +   β–„β–€β–„β–„  β–€β–„  β–„  β–„  β–„ β–€β–€β–€ β–€β–€β–€β–€β–€β–„ +    β–€β–€  β–€ β–„β–€β–„β–„  β–„β–€ β–„   β–€ β–€β–€β–€ + β–„  β–„β–„β–„β–€ β–„        β–„  β–„β–„ β–€β–€   +   β–„ β–€β–€β–€ β–„β–€β–€      β–„β–„β–„  β–€β–€β–€β–€β–€  + β–€β–€β–„β–„β–„β–„β–„β–„          β–€ β–€ β–€  +   β–„β–„β–€β–„β–€ β–€  β–€β–„β–„β–„β–„  + β–„β–„β–€β–€ β–„β–„β–€β–€β–€β–„β–€β–„β–„ β–€β–„  + β–€ β–€β–„β–„β–„    β–„β–€β–„β–€    +     β–€β–„   β–€β–€β–„β–„β–„β–„β–„β–„  +  β–€β–€β–„ β–€β–„   β–„ β–€β–„β–€ β–€β–€ β–„β–„  +  β–„   β–€β–€β–€ β–€β–€β–„β–„ β–€β–„β–€   +  β–„ β–„β–„β–„β–€  β–„ β–„ β–€β–„β–„β–„β–„β–„  +     β–€β–€β–€β–€ β–€β–„β–„      + β–„β–„      β–„ β–„ β–€β–€β–€β–€β–€β–€β–€  + β–„β–„β–„β–€β–€ β–€    β–„β–„β–€    +  β–€β–€ β–„β–„  β–€β–€  β–€β–€ β–„β–„β–€β–„β–„   +  β–€β–€β–€β–€β–€β–€  β–€β–€β–€β–€β–€   From 1033fb1b891e8a19a759e087661a314505a4ef72 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Sat, 16 Feb 2013 18:48:34 -0300 Subject: [PATCH 06/14] Forget ponyquotes SPOILER and Luna quote Signed-off-by: Pablo Lezaeta --- ponyquotes/luna.7 | 1 + ponyquotes/ponies | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 ponyquotes/luna.7 diff --git a/ponyquotes/luna.7 b/ponyquotes/luna.7 new file mode 100644 index 00000000..5adee848 --- /dev/null +++ b/ponyquotes/luna.7 @@ -0,0 +1 @@ +FACE YOUR FEARS!!! diff --git a/ponyquotes/ponies b/ponyquotes/ponies index da3e0828..1947dd03 100644 --- a/ponyquotes/ponies +++ b/ponyquotes/ponies @@ -211,7 +211,7 @@ trixie+trixiestage+trixiestand+lulamoon+trixielulamoon+trixieamulet truffleshuffle turf turnip -twilight+twilightcrazyfromball+twilightrage+twilightzero+fillytwilight+twilightthebearded+twilighttime+twilightcrystal+twilightspike +twilight+twilightcrazyfromball+twilightrage+twilightzero+fillytwilight+twilightthebearded+twilighttime+twilightcrystal+twilightspike+twilightprincess thinkleshine twist vinyl+djpon-3 From f4930c76c6f364bdb78bc78461303894f2140a7e Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Sat, 16 Feb 2013 21:10:59 -0300 Subject: [PATCH 07/14] Added Paradise fanfic reference to extraponies Signed-off-by: Pablo Lezaeta --- CHANGELOG | 2 +- extraponies/paradise.pony | 62 +++++++++++++++++++++++++++++++++++++++ manuals/ponysay.texinfo | 2 +- ponies/celestia.pony | 2 +- 4 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 extraponies/paradise.pony diff --git a/CHANGELOG b/CHANGELOG index 505a83e8..4b3422ac 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,7 +6,7 @@ Version 3.0 rumble, shiningarmorcrystal, sombra, spikecrystal, squirrel, sweetcream (comic), trixieamulet, twilightcrystal, twilightprincess, twinkleshine - New extraponies: gleamingshield, johndelancie, orion, pipsqueak (without pirate suit), pizzapony, tempo + New extraponies: gleamingshield, johndelancie, orion, pipsqueak (without pirate suit), paradise, pizzapony, tempo Ponies renamed: lotusbloosom β†’ lotusblossom (typo) maredowellgallop β†’ maredowellgallop (need a version named as master) diff --git a/extraponies/paradise.pony b/extraponies/paradise.pony new file mode 100644 index 00000000..e0435b87 --- /dev/null +++ b/extraponies/paradise.pony @@ -0,0 +1,62 @@ +$$$ +APPEARANCE: Paradise +BALLOON: top +COAT: white +COAT: cyan +DISPLAY: full, left +DISPLAY: full, left +EYE: pink +EYE: green +FREE: no +GROUP: mare, tritagonist +GROUP: mare, tritagonist +GROUP NAME: paradise +KIND: earth +KIND: earth +LINK: regular +LINK ON: 1 +MANE: pink +MANE: blue +MASTER: celestia +MEDIA: fanfic +NAME: Celestia +NAME: Luna +OTHER NAMES: Princess Celestia (official, full name) +OTHER NAMES: Princess Luna (official, full name), Lunija (official, russian), Nightmare Moon (official, corrupted), Woona (unofficial) +POSE: stand +SOURCE: [jristz] +WIDTH: 55 +HEIGHT: 30 + + +$$$ +$balloon6$ + $\$ + $\$ + $\$ + β–„β–€β–€β–€β–€β–€β–„β–„  + β–„β–€  β–€β–€β–„  + β–„β–€   β–€β–„  +   β–„β–„β–€β–€β–€β–€β–€    β–„  +   β–„β–„β–€β–€ β–„β–€   +   β–„β–€β–€β–€β–€β–„β–„ β–„ β–€   +    β–„ β–„   β–€   +  β–„ β–€β–€ β–„β–€      + β–€β–„   β–€  + β–€β–€ β–€β–€β–€  β–„β–„β–€β–€   + β–„   β–„β–€β–„β–„β–„β–€  β–„ β–„β–„β–„β–„β–„β–„  β–„β–„  + β–€β–„β–„β–„  β–„ β–€β–€β–„  β–€ β–„β–„β–€β–€β–„β–€β–€    β–€β–„  + β–„β–„β–„β–„β–€β–€β–€β–„    β–€β–„β–„ β–€ β–€      +    β–„     β–„β–„ β–€β–„  + β–„ β–€β–„β–„β–„β–€   β–„ β–€ β–€ β–„β–„β–„β–„ β–„     +  β–€β–„β–„β–€  β–€β–„         β–€   +  β–€ β–€β–€ β–€β–„ β–€  β–„  β–„ β–„β–„β–€β–„ β–€β–„   + β–„β–€ β–€β–€β–„β–€ β–€β–„    β–„ β–€β–€ β–„β–€β–„ β–„ β–„β–„β–„β–„  + β–„β–„β–„β–„β–„β–„β–„  β–„β–€β–€β–€β–€ β–€β–€β–€β–€β–€β–„ β–€ β–€ β–€β–„ β–„β–€ β–€β–„β–€β–„  + β–€β–€β–€β–€β–€β–€β–€ β–€ β–€β–€β–€β–€   β–€ β–€β–€β–„β–„      +      β–€β–„β–„   β–€β–„  +    β–€ β–€ β–€ β–€β–€ β–€β–„      +   β–„β–€β–€β–€β–€β–„β–„β–„β–„β–„β–€β–€β–€    β–€ β–€β–„  β–„        +    β–„β–€β–„ β–„β–€β–„β–€       β–€β–„       β–„ + β–€β–„β–„β–„β–„β–€  β–€     β–€      β–€   + β–€β–€β–€β–€ β–€β–€β–€β–€ β–€β–€β–€β–€  diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 70d9b1b3..82df8769 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -2924,7 +2924,7 @@ New ponies: @file{amira}, @file{babseed}, @file{bear}, @file{beautybrass}, @fil @file{ravenunicorn}, @file{royalunicornguard}, @file{rumble}, @file{shiningarmorcrystal}, @file{sombra}, @file{spikecrystal}, @file{squirrel}, @file{sweetcream} (comic), @file{trixieamulet}, @file{twilightcrystal}, @file{twilightprincess}, @file{twinkleshine} @item -New extraponies: @file{gleamingshield}, @file{johndelancie}, @file{orion}, @file{pipsqueak}, @file{pizzapony}, @file{tempo} +New extraponies: @file{gleamingshield}, @file{johndelancie}, @file{orion}, @file{pipsqueak}, @file{pardise}, @file{pizzapony}, @file{tempo} @item @file{lotusbloosom} has been renamed to @file{lotusblossom} (typo) @item diff --git a/ponies/celestia.pony b/ponies/celestia.pony index 907f08d3..59a9eed7 100644 --- a/ponies/celestia.pony +++ b/ponies/celestia.pony @@ -1,5 +1,5 @@ $$$ -APPEARANCE: S01E01 Frienship is Magic [Part 1] (animated in a book, real life first appearance is S01E02 Frienship is Magic [Part 2]) +APPEARANCE: S01E01 Friendship is Magic [Part 1] (animated in a book, real life first appearance is S01E02 Frienship is Magic [Part 2]) AURA: yellow BALLOON: top COAT: white From 1d5618546e3b5849b12e3111197c70601631c1a4 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Sat, 16 Feb 2013 23:03:34 -0300 Subject: [PATCH 08/14] Checking M. A. Larson Twits he mention acorn for the Alicorn name in many Twitts alognside Alicorn, aditionally a alicorn is wrong ... is an alicorn Signed-off-by: Pablo Lezaeta --- manuals/ponysay.texinfo | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 82df8769..d0c641ad 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -901,10 +901,10 @@ is) may be added if required. This tag decribes what kind of pony a pony is, it is a comma seperated lower case list, and it cannot be empty, by it can be (but shouldn't) skipped for every pony in the image. -Every fitting value should be used, however a alicorn (also known as alacorn, winged -unicorn or pegacorn) should have the values @code{alicorn} and @code{pony}, but neither -@code{pegasus} nor @code{unicorn}. Earth ponies should have the value @code{pony} and -@code{earth} (not @code{earth pony}.) +Every fitting value should be used, however an alicorn (also known as alacorn, winged +unicorn, acorn, pegasus-unicorn or pegacorn) should have the values @code{alicorn} and +@code{pony}, but neither @code{pegasus} nor @code{unicorn}. Earth ponies should have +the value @code{pony} and @code{earth} (not @code{earth pony}.) The standard values are (you may use other ones if fitting): @code{unicorn}, @code{pegasus}, @code{alicorn}, @code{earth}, @code{pony}, @code{changeling}, @code{crystal}, @code{seapony}, From a879e34a9ac16127aa705023b714f4d6c9d3a7d6 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Sun, 17 Feb 2013 11:48:48 -0300 Subject: [PATCH 09/14] Fix Signed-off-by: Pablo Lezaeta --- ponies/twist.pony | 1 + ponies/waltercoltchak.pony | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ponies/twist.pony b/ponies/twist.pony index 9e253af0..8b2329d3 100644 --- a/ponies/twist.pony +++ b/ponies/twist.pony @@ -10,6 +10,7 @@ KIND: earth LINK: regular MANE: orange (ponysay), red (source) NAME: Twist +OTHER NAMES: Peppermint Twist (official, son Gameloft Game) POSE: stand SOURCE: (Anonycat) Desktop ponies WIDTH: 33 diff --git a/ponies/waltercoltchak.pony b/ponies/waltercoltchak.pony index 0471c682..792b83ba 100644 --- a/ponies/waltercoltchak.pony +++ b/ponies/waltercoltchak.pony @@ -12,7 +12,7 @@ MANE: brown NAME: (not mentioned) OTHER NAMES: Walter Coltchak (official, stated official by the crew) POSE: stand -SOURCE: (bot-chan) Desktop ponies +SOURCE: (Bot-chan) Desktop ponies WIDTH: 40 HEIGHT: 26 From ad2cba5d74830a8c83fa6aa6c8ea02d5f15d55db Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Sun, 17 Feb 2013 17:25:13 -0300 Subject: [PATCH 10/14] Added Spike quote Signed-off-by: Pablo Lezaeta --- ponyquotes/spike.11 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ponyquotes/spike.11 diff --git a/ponyquotes/spike.11 b/ponyquotes/spike.11 new file mode 100644 index 00000000..6c3833b2 --- /dev/null +++ b/ponyquotes/spike.11 @@ -0,0 +1,3 @@ +Nah, pshaw. I'll be fine. +But, uh, just between you and me, +I gotta give priority to the... paying customers. From 9345b402b0a54d79c5f1affb739faeea38594022 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Sun, 17 Feb 2013 21:29:30 -0300 Subject: [PATCH 11/14] Change the royal status fallow issue #138 Signed-off-by: Pablo Lezaeta --- ponies/changelingqueen.pony | 2 +- ponies/chrysalis.pony | 2 +- ponies/shiningarmor.pony | 2 +- ponies/shiningarmorcrystal.pony | 2 +- ponies/shiningarmorguard.pony | 2 +- ponies/shiningarmorwedding.pony | 2 +- ponies/sombra.pony | 2 +- ponies/twilightprincess.pony | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ponies/changelingqueen.pony b/ponies/changelingqueen.pony index c7247aa6..56191b76 100644 --- a/ponies/changelingqueen.pony +++ b/ponies/changelingqueen.pony @@ -6,7 +6,7 @@ COAT: black DISPLAY: full, right EYE: green FREE: no -GROUP: antagonist +GROUP: mare, antagonist, royal KIND: changeling LINK: regular MANE: teal diff --git a/ponies/chrysalis.pony b/ponies/chrysalis.pony index c15f7262..cd23c589 100644 --- a/ponies/chrysalis.pony +++ b/ponies/chrysalis.pony @@ -6,7 +6,7 @@ COAT: black DISPLAY: full, right EYE: green FREE: no -GROUP: mare, antagonist +GROUP: mare, antagonist, royal KIND: changeling LINK: regular MANE: blue diff --git a/ponies/shiningarmor.pony b/ponies/shiningarmor.pony index 079f73f1..cd0d63ea 100644 --- a/ponies/shiningarmor.pony +++ b/ponies/shiningarmor.pony @@ -5,7 +5,7 @@ COAT: white DISPLAY: full, right EYE: cyan FREE: no -GROUP: stallion, tritagonist, royal +GROUP: stallion, tritagonist KIND: unicorn LINK: regular MANE: blue diff --git a/ponies/shiningarmorcrystal.pony b/ponies/shiningarmorcrystal.pony index 2e5bbab0..6f3e6927 100644 --- a/ponies/shiningarmorcrystal.pony +++ b/ponies/shiningarmorcrystal.pony @@ -5,7 +5,7 @@ COAT: white DISPLAY: full, left EYE: cyan FREE: no -GROUP: stallion, tritagonist, crystal, royal +GROUP: stallion, tritagonist, crystal KIND: unicorn LINK: regular MANE: blue diff --git a/ponies/shiningarmorguard.pony b/ponies/shiningarmorguard.pony index 7da2d6c5..24d4da4d 100644 --- a/ponies/shiningarmorguard.pony +++ b/ponies/shiningarmorguard.pony @@ -5,7 +5,7 @@ COAT: white DISPLAY: full, right EYE: cyan FREE: no -GROUP: stallion, royal, tritagonist +GROUP: stallion, tritagonist KIND: unicorn LINK: regular MANE: blue diff --git a/ponies/shiningarmorwedding.pony b/ponies/shiningarmorwedding.pony index 252c96fc..58bd63af 100644 --- a/ponies/shiningarmorwedding.pony +++ b/ponies/shiningarmorwedding.pony @@ -5,7 +5,7 @@ COAT: white DISPLAY: full, left EYE: cyan FREE: no -GROUP: stallion, tritagonist, royal +GROUP: stallion, tritagonist KIND: unicorn LINK: regular MANE: blue diff --git a/ponies/sombra.pony b/ponies/sombra.pony index 1005cd9d..3dd7a1cb 100644 --- a/ponies/sombra.pony +++ b/ponies/sombra.pony @@ -6,7 +6,7 @@ COAT: grey DISPLAY: full, left EYE: green (in flashback), white (in last scene), brown (ponysay) red (source), purple aura FREE: no -GROUP: stallion, antagonist +GROUP: stallion, antagonist, royal KIND: unicorn LINK: regular MANE: black diff --git a/ponies/twilightprincess.pony b/ponies/twilightprincess.pony index 4d727311..81b6986e 100644 --- a/ponies/twilightprincess.pony +++ b/ponies/twilightprincess.pony @@ -1,12 +1,12 @@ $$$ -APPEARANCE: S01E01 Friendship is Magic [Part 1] +APPEARANCE: S03E13 Magical Mistery Cure AURA: purple (whitish lilac in season 1) BALLOON: top COAT: purple DISPLAY: full, left EYE: purple FREE: no -GROUP: mare, mane, toyal +GROUP: mare, mane, royal KIND: alicorn LINK: regular MANE: purple From f1203e18ce0f531d79a67a85bf112a26c03244f0 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Reyes Date: Tue, 19 Feb 2013 07:44:38 -0300 Subject: [PATCH 12/14] Fix #139 Signed-off-by: Pablo Lezaeta Reyes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f77317e..923d2979 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ A git version of the package is available as `ponysay-git` in CCR, alongside a s There is a package for Gentoo, to make installation and keeping it up to date easy. You can find it in [this overlay](/etu/aidstu-overlay). The package is named `games-misc/ponysay`. #### Debian GNU/Linux and Ubuntu -The DEB file can be found [here](http://roryholland.co.uk/misc.html#ponysay) and PPA:s can be found [here](https://launchpad.net/~vincent-c/+archive/ppa) and [here](https://launchpad.net/~blazemore/+archive/ponysay). +The DEB file can be found in those PPA:s [here](https://launchpad.net/~vincent-c/+archive/ppa) and [here](https://launchpad.net/~blazemore/+archive/ponysay). ### Pony fortune on terminal startup From 4d4cfed999c2cf25cfb147892b551def93e3118d Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Reyes Date: Wed, 20 Feb 2013 00:10:38 -0300 Subject: [PATCH 13/14] Added Donut pony, mentioned on #131 Signed-off-by: Pablo Lezaeta Reyes --- CHANGELOG | 2 +- extraponies/donutpony.pony | 47 ++++++++++++++++++++++++++++++++++++++ manuals/ponysay.texinfo | 3 ++- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 extraponies/donutpony.pony diff --git a/CHANGELOG b/CHANGELOG index 4b3422ac..635a270b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,7 +6,7 @@ Version 3.0 rumble, shiningarmorcrystal, sombra, spikecrystal, squirrel, sweetcream (comic), trixieamulet, twilightcrystal, twilightprincess, twinkleshine - New extraponies: gleamingshield, johndelancie, orion, pipsqueak (without pirate suit), paradise, pizzapony, tempo + New extraponies: donutpony, gleamingshield, johndelancie, orion, pipsqueak (without pirate suit), paradise, pizzapony, tempo Ponies renamed: lotusbloosom β†’ lotusblossom (typo) maredowellgallop β†’ maredowellgallop (need a version named as master) diff --git a/extraponies/donutpony.pony b/extraponies/donutpony.pony new file mode 100644 index 00000000..26e7f0c2 --- /dev/null +++ b/extraponies/donutpony.pony @@ -0,0 +1,47 @@ +$$$ +BALLOON: top +COAT: brown +DISPLAY: full, left +EYE: yellow +FREE: yes +GROUP: mare +KIND: pegasus +LICENSE: cc-by-sa (Creative Commons Attribution-ShareAlike 3.0 Unported) +LINK: regular +MANE: pink, white, red, blue, yellow +MEDIA: [fanart] +NAME: Donut pony +POSE: fly +SOURCE: [jristz] +WIDTH: 43 +HEIGHT: 26 + +License summary: https://creativecommons.org/licenses/by-sa/3.0 +Full license text: https://creativecommons.org/licenses/by-sa/3.0/legalcode +$$$ +$balloon5$ + $\$ + $\$ + $\$ + β–„β–€β–€β–€β–€β–€β–€β–€β–„β–„  + β–„β–€β–€ β–„ β–€ β–€β–„  + β–„β–€ β–„ β–„ β–€ β–€ β–„β–€β–„  + β–€β–„β–„β–„ β–„  β–„β–€ β–„  β–„β–€β–„β–„β–„  +  β–„β–„β–„β–„β–€β–€β–€β–„β–€β–€β–€β–„β–„    β–„  β–„β–„  +   β–€β–„β–„β–€β–„ β–€β–„β–„β–€ β–€   β–„   β–„β–€ β–„β–€β–€   + β–€β–„β–€β–„β–„ β–„β–€β–„ β–€β–„β–„      β–„   β–€β–„β–€  +    β–„ β–€   β–„  β–„ β–„β–„β–€β–„  β–„β–„  + β–„  β–„ β–„β–„β–€β–„   β–€β–„ β–€β–„β–„ β–„  β–„β–„   +     β–€β–„β–€     β–€   β–„β–€β–„β–„β–€  + β–€β–€β–„β–„β–„β–„β–„β–„ β–„β–€ β–€β–„β–€  β–„β–€β–€  β–„β–€β–€β–€β–€β–€β–„β–„  +  β–„ β–€β–„β–€β–€β–„  β–€ β–€β–€β–€β–„ β–€ β–€ β–€β–„β–„  +  β–„ β–„ β–€β–€β–„β–€ β–„β–„β–€β–„  β–„β–„β–„  β–€ β–„   + β–€β–„ β–€ β–€  β–„β–€    β–„ β–€ β–€    + β–„β–„ β–€  β–„β–„ β–€ β–„β–„   β–„β–€ β–„  β–„β–€  +  β–„β–„ β–„β–„β–„β–„ β–€β–€β–€β–€β–€β–€    β–„ β–„  β–€β–„  +     β–„β–„β–„β–„  β–€β–„   β–„β–„β–„β–€β–„β–€β–„ β–„β–„β–„  +  β–„ β–„ β–„β–„   β–„β–€β–€  β–€β–„ β–€ β–„β–„   + β–€   β–„ β–€  β–„β–„β–„   β–€β–„β–„β–€β–„ β–€β–€β–€β–„  + β–€β–„β–€ β–„β–€ β–€β–„ β–„  β–€ β–„β–„β–„β–€β–€ β–€β–€β–€  + β–€β–„β–€ β–€β–€β–€ β–„ β–„   + β–€β–„β–„β–€  diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index d0c641ad..9403682e 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -2924,7 +2924,8 @@ New ponies: @file{amira}, @file{babseed}, @file{bear}, @file{beautybrass}, @fil @file{ravenunicorn}, @file{royalunicornguard}, @file{rumble}, @file{shiningarmorcrystal}, @file{sombra}, @file{spikecrystal}, @file{squirrel}, @file{sweetcream} (comic), @file{trixieamulet}, @file{twilightcrystal}, @file{twilightprincess}, @file{twinkleshine} @item -New extraponies: @file{gleamingshield}, @file{johndelancie}, @file{orion}, @file{pipsqueak}, @file{pardise}, @file{pizzapony}, @file{tempo} +New extraponies: @file{donutpony}, @file{gleamingshield}, @file{johndelancie}, @file{orion}, @file{pipsqueak}, @file{pardise}, +@file{pizzapony}, @file{tempo} @item @file{lotusbloosom} has been renamed to @file{lotusblossom} (typo) @item From e9146c8a0478a7bab127185ed531aa62e2d11bac Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Reyes Date: Wed, 20 Feb 2013 04:50:41 -0300 Subject: [PATCH 14/14] Added more quotes for the mane 6 minus twilight and pinke Signed-off-by: Pablo Lezaeta Reyes --- ponyquotes/applejack.11 | 1 + ponyquotes/applejack.12 | 2 ++ ponyquotes/applejack.13 | 1 + ponyquotes/applejack.14 | 1 + ponyquotes/applejack.15 | 1 + ponyquotes/applejack.16 | 1 + ponyquotes/fluttershy.32 | 1 + ponyquotes/fluttershy.33 | 1 + ponyquotes/fluttershy.34 | 1 + ponyquotes/rainbow.22 | 1 + ponyquotes/rainbow.23 | 1 + ponyquotes/rainbow.24 | 1 + ponyquotes/rarity.26 | 1 + ponyquotes/rarity.27 | 1 + 14 files changed, 15 insertions(+) create mode 100644 ponyquotes/applejack.11 create mode 100644 ponyquotes/applejack.12 create mode 100644 ponyquotes/applejack.13 create mode 100644 ponyquotes/applejack.14 create mode 100644 ponyquotes/applejack.15 create mode 100644 ponyquotes/applejack.16 create mode 100644 ponyquotes/fluttershy.32 create mode 100644 ponyquotes/fluttershy.33 create mode 100644 ponyquotes/fluttershy.34 create mode 100644 ponyquotes/rainbow.22 create mode 100644 ponyquotes/rainbow.23 create mode 100644 ponyquotes/rainbow.24 create mode 100644 ponyquotes/rarity.26 create mode 100644 ponyquotes/rarity.27 diff --git a/ponyquotes/applejack.11 b/ponyquotes/applejack.11 new file mode 100644 index 00000000..c318d3d0 --- /dev/null +++ b/ponyquotes/applejack.11 @@ -0,0 +1 @@ +Forget it, Trixie! I ain't doin' nothin' 'til you let Twilight come home! diff --git a/ponyquotes/applejack.12 b/ponyquotes/applejack.12 new file mode 100644 index 00000000..990803b4 --- /dev/null +++ b/ponyquotes/applejack.12 @@ -0,0 +1,2 @@ +Dear Princess Celestia, +I wanted to share my thoughts with you. [clears throat] I didn't learn anything! I was right all along! diff --git a/ponyquotes/applejack.13 b/ponyquotes/applejack.13 new file mode 100644 index 00000000..275e03a5 --- /dev/null +++ b/ponyquotes/applejack.13 @@ -0,0 +1 @@ +Phooey on the festivities. I can't wait to try all of those tasty treats! diff --git a/ponyquotes/applejack.14 b/ponyquotes/applejack.14 new file mode 100644 index 00000000..7da52fcb --- /dev/null +++ b/ponyquotes/applejack.14 @@ -0,0 +1 @@ +Well, color me pleased as punch. diff --git a/ponyquotes/applejack.15 b/ponyquotes/applejack.15 new file mode 100644 index 00000000..9bd9aee5 --- /dev/null +++ b/ponyquotes/applejack.15 @@ -0,0 +1 @@ +But... good things are better when they're a Rarity. diff --git a/ponyquotes/applejack.16 b/ponyquotes/applejack.16 new file mode 100644 index 00000000..3bc8e8dc --- /dev/null +++ b/ponyquotes/applejack.16 @@ -0,0 +1 @@ +I'm Applejack! More apple fwitter? diff --git a/ponyquotes/fluttershy.32 b/ponyquotes/fluttershy.32 new file mode 100644 index 00000000..9bfeb9c2 --- /dev/null +++ b/ponyquotes/fluttershy.32 @@ -0,0 +1 @@ +We knew for sure you would prevail. diff --git a/ponyquotes/fluttershy.33 b/ponyquotes/fluttershy.33 new file mode 100644 index 00000000..958210e3 --- /dev/null +++ b/ponyquotes/fluttershy.33 @@ -0,0 +1 @@ +Mr. Beaverton Beaverteeth! Such Language! diff --git a/ponyquotes/fluttershy.34 b/ponyquotes/fluttershy.34 new file mode 100644 index 00000000..4b605d67 --- /dev/null +++ b/ponyquotes/fluttershy.34 @@ -0,0 +1 @@ +He [discord] can be a real sweetheart once you get to know him. diff --git a/ponyquotes/rainbow.22 b/ponyquotes/rainbow.22 new file mode 100644 index 00000000..1afd8a58 --- /dev/null +++ b/ponyquotes/rainbow.22 @@ -0,0 +1 @@ +No offense, but it's not a real campfire story unless somepony's shaky. diff --git a/ponyquotes/rainbow.23 b/ponyquotes/rainbow.23 new file mode 100644 index 00000000..2bf66061 --- /dev/null +++ b/ponyquotes/rainbow.23 @@ -0,0 +1 @@ +Hey slackers! Double time and head on over to Ponyville, will 'ya? We're all waiting on you! diff --git a/ponyquotes/rainbow.24 b/ponyquotes/rainbow.24 new file mode 100644 index 00000000..094eae75 --- /dev/null +++ b/ponyquotes/rainbow.24 @@ -0,0 +1 @@ +PUNCH HOLES IN THE SKY! diff --git a/ponyquotes/rarity.26 b/ponyquotes/rarity.26 new file mode 100644 index 00000000..2f1c0dbf --- /dev/null +++ b/ponyquotes/rarity.26 @@ -0,0 +1 @@ +As fun as creating this haute-couture ensemble that I just finished making? Delightful, non? diff --git a/ponyquotes/rarity.27 b/ponyquotes/rarity.27 new file mode 100644 index 00000000..5f61a3a1 --- /dev/null +++ b/ponyquotes/rarity.27 @@ -0,0 +1 @@ +I despise camping! All of that... nature.