From 951b33a59e795b97f87bb6a1faec596c7dc32211 Mon Sep 17 00:00:00 2001
From: Stefan Ritter <xeno@thehappy.de>
Date: Thu, 26 May 2011 13:06:41 +0200
Subject: [PATCH] Add random for other combinations

---
 .genregenerator.py.swp | Bin 0 -> 12288 bytes
 genregenerator.py      |   7 +++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .genregenerator.py.swp

diff --git a/.genregenerator.py.swp b/.genregenerator.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..db9397beee88cfdf510f3489f7a9e24732e121bc
GIT binary patch
literal 12288
zcmeI2&2Ah;5XU=+1K}eeIB=wFBS>Jq>)4S%D~v!GLZk$uI3$V?hn|_*nT}_=NByyz
z^#O@jK!R7{5jb#$Bags=7l40v+Y01jbKwy6O6BR9?)v&wbzAmMwR7*rEqZUdC-8Yi
zh_|l&e(UbDb8&G~h)1kVe0<iYmA&j_bJjBPZ8SJ*c**^&Wo;Qh*h+8g6SvcGeWtOp
zpb#ho&QBot#rFFziM`#cJ6oF@^xCUmonN=CECdRHLZA>R1PXydpb#ho3W2ABfFCc2
zzmUl@kk=s>P6U_oDFh0ELZA>R1PXydpb#ho3V}kP5GVu+fv1E({M!Df=Y)9sA`-&)
z|M7nSf4nTjZ;)Rh-$QOgUWEK|Nr)dIKR_NrK7|}WHXsBUUl8KW=Y`mUT!Q=zo8Lih
zL2g2#k3Zq-4P48o5GVu+fkL1VC<F?D|Bt{HE!8k5$DZ73{~Gz#{tkJE5kDHGZoI7K
zLZ}5<+>mm#H>dGGEA2wbD($K6jH>yv3sq}P7_UrDpXA$rI=XtM&UvitoZkw)`$RA)
z<^7a7V!ymIq1`J&q)2I>zTT{j<;@9g4(w$g2csF&CFrAgtxeG0uH(?kG_zvo+3NU2
z4wYi<<Ir>6X%k1C2`-uR@Li`-b2_M4rqxZTU?iDyFe0N~-Ko(BofIC*<Ky_u9i=H}
zLW)hc2t0a<b5<_XTBA1NZPf>Et#mHlz|?k^6KQSGZCYqeeIzT@_bD5to8Y`vIqRsM
zHN!BD$thlDZRO+eJK3ig5PI}*Sa(S8c=H=^TET>K;70K>+iZ|*inQuwonUs-Hc@%B
zrnT&x${D!zFm^_(I?gTCk<x8iC0m&=<I*~xf<i;HRRf@BAF_|Nkp9HdptKrJyi1#W
zy0y+xEP@ZY)|F`z0;HgvSJ?@8oQzNi&AEgeY_6#s$D}fv726oxA~<DIbPLOgk{g**
zcBs2cdGjN0dB~H&E}~jxRcZhpl3nh(_VzS&&FP^wDtjN@y6(8)K9d=ZOS-kuu2$%>
zWKeqFCl@Ro_NKwl_&j#$<GZ$(Lwwq?T&6taQfl9#97(k`zRNz)UnUo2ak2q)h>8RE
zrpZfc?tLEpyM=mGApt@Djq;$A3xT2!F~d~9Mp>T%XbpI!hN@(LluOWKujN*~V?65G
z<e**9E|w(5fsSQP31Vyb9K5tLYjwt2ld5yTpqfdy9eba+%33w(SFx~WNCyHgY8Z_@
zJ<=wp#{~Z1qXTxe#g0TCbGn{i>t-5I_L|bG-VTdC4jxYDbm(~@HQiA$Z2BO+75<U$
zxQlHwZTQ1zu=9SL&t}-~(_^!q8r#lRelhm5PrkhU;Kmo%X<;l4IF6{nS)_V5h0<L^
zw?l;npqn^zwc`ohV;ftKb|)kqjd9kYOQ>4Yp&aOQQ)2_#DIGGy08ac_vfHS|nv|!Y
z8-$492%!#+%p%<!7`op{Pj@l#S*VZbfeCaUO#&NnF?t!Bj<EZNm}GK?>=2o(dZu2k
zrb(p+28%-=9xYYy43{yD4!?EMu1ACz#yvyMEc{AZp3;rjsslS(Dew#)QLhP8IAQ#H
kLf%Av+wW{+RfEG}PU+R(_(W`N%!0GCO6l3ShO!oa1L#e0-2eap

literal 0
HcmV?d00001

diff --git a/genregenerator.py b/genregenerator.py
index cc13583..f371219 100644
--- a/genregenerator.py
+++ b/genregenerator.py
@@ -10,11 +10,14 @@
 # Author: Stefan Ritter <xeno@thehappy.de>
 # Description: Generate music genres
 
-from random import choice
+from random import choice, randint
 
 subgroup = ["medieval", "death", "black", "hard", "progressive", "symphonic", "viking", "pagan", "gangsta", "experimental", "alternative", "minimal", "dark", "synth", "future", "body", "christian", "indian", "chinese", "euro", "happy", "power", "fusion", "free", "speed", "trash", "extreme", "surf", "brit", "emo", "electronic", "neo", "noise", "psychedelic", "post", "conscious", "battle", "east coast", "west coast", "glam", "heavy", "avantgarde", "gothic", "groove", "funk", "nu", "melodic", "celtic", "industrial", "latin", "traditional", "harmonica", "dirty", "gospel", "balkan", "lounge", "Rotterdam", "sunshine", "street", "skate", "garage", "horror", "Detroit", "ghetto", "acid"]
 group = ["core", "metal", "pop", "punk", "country", "rap", "western", "ambient", "techno", "house", "trance", "dance", "beat", "dubstep", "samba", "chiptune", "jazz", "ska", "soul", "aggrotech", "rave", "oi!", "bluegrass", "hip-hop", "grunge", "rockabilly", "industrial", "blues", "humppa", "reggae", "dancehall", "dub", "Schranz"]
 
-print choice(subgroup), choice(subgroup), choice(group)
+rand = randint(0, 2)
+if rand is 0: print choice(subgroup), choice(subgroup) + choice(group)
+if rand is 1: print choice(subgroup), choice(subgroup), choice(group)
+if rand is 2: print choice(subgroup), choice(group)
 
 # vim: set sw=4 tw=0 ts=4 expandtab: