From e73ad787873f220a48a23f3a37125dcad45e0a96 Mon Sep 17 00:00:00 2001
From: tcaxle <tcac2@cam.ac.uk>
Date: Sat, 11 Apr 2020 15:29:21 +0100
Subject: [PATCH] Charms. Migrations.

---
 app/__pycache__/models.cpython-38.pyc         | Bin 12695 -> 13874 bytes
 .../0013_charm_rollconfiguration.py           |  20 +++++++++
 app/migrations/0014_auto_20200411_1428.py     |  38 ++++++++++++++++++
 ...013_charm_rollconfiguration.cpython-38.pyc | Bin 0 -> 772 bytes
 .../0014_auto_20200411_1428.cpython-38.pyc    | Bin 0 -> 1026 bytes
 app/models.py                                 |  30 ++++++++++++--
 6 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100644 app/migrations/0013_charm_rollconfiguration.py
 create mode 100644 app/migrations/0014_auto_20200411_1428.py
 create mode 100644 app/migrations/__pycache__/0013_charm_rollconfiguration.cpython-38.pyc
 create mode 100644 app/migrations/__pycache__/0014_auto_20200411_1428.cpython-38.pyc

diff --git a/app/__pycache__/models.cpython-38.pyc b/app/__pycache__/models.cpython-38.pyc
index 7375b475cbf18aa36689de493456f145c51ec663..4b7163ff154d3b6b6c1af1e5f135f9e12ee713e1 100644
GIT binary patch
delta 2430
zcmbVNT~Jd;6wW3ggaC;lAit6SpP>AR*lMLp1OY{Y610jo2<!#Igrr?U{likh=yWVr
zTw7~fwcuC>6~`8z`lRoD>`Z5vX*+%BOgo+FXdmqOQv02o2)FdDWH|SH-}!d;?Cv@D
zUg`TfVBMFTY|-Jb^1Er@YYo%Z9QNp|wVT*@_N1XJr&-6h@VYZPUZ=1jCzv&0UgulE
zYz31GCJ)RuUJs@|#^i%>^X*`^EBR0q05|YP;6@b}0`K5Wz)dPH0&eClz%8*Eiko%g
zd?()pYL`-sDM}z|<-37*tGE=njeCGSN-5%H!0mhw@E#SrfcNqa;0{$^4(#Qfz@4!r
z)`Ho`_k-CVW7dIrgC78M0L(b;tpe0R-UX^FCaMH;h#v-XSgC}f3iwU#1NN!78n~Mu
z0X`BNu^vnh?*-GVtjCBN;6BcQxr#RcE4&}LU#UU77I=UUt^zTr5*xYRt8@7mzR~}l
zB0Y`-X-g_xW%Kk5E4(Qr6#qc5RXHw$$ywvIxW+LyX5g$&7uF4tr?1m-1D?j%GY%2`
zq;AMCrXMq0U`)q#UfrC@BVNVW#e`6>n=1h&taOS^L>Pmkfxw(m=n2F(xV;VT#vP&#
zNW4zQLuNafMx9R9*%FI>0~k>YikX=O|7La~V`Z{WlM3xV2!ACp&247FCueN+t5Q{I
zTTk$KXNauyC+BV{fa2x8IP&HO+8=how7YN_qq~TvF1BEh@W^Ugdfro7#ss5_=Hpzs
z2y>L#Il@m!7|VxKKGqaf+8$IoLok$0<NrNn(T&+fFBvthg1>0B6-Sl*@AW7#1+r%(
zjU}cmOsDw_tVBM^*lZf0>E4o6ne$A@A2PlAWF~8}PO<@cKPziPn4+U(-XU|8%rP>@
z$($f_lFS&HQ)Eud$GI7%ez=Uu%<MI+U!E>>%6-`nlHF`MhlotcDPa-0Ij6`m0dYOW
zjBw1%suvULn5mpo_H&?iXvUq3MKGiDp#40eEt=^0rRZ~Kr+o_1R!wwDjh<X{j7?IK
zWf8<XG;zWnmsvF9DO$+vBomRfxwUB*;qE0dl>w48n3%YT8%~u!Rp!X~+;#R#2prH%
zcS&6?KJQ_4IXg|?t%*nEFL{S>1n&H^ahDPE$#3&B+2y4<R~Mu(Nr_soAv&})Qa&op
zlc9p=nb$!N6HO&ReG>hN>sUBs`Us@>SUxMvkG}%f<Fd-PovBXo3Gr9ScwrVTo$h9D
zx4WaQy+eE^+l$KC=d@<p4Fr$U<VkR-5vdjBp0X@i<xG&*3$1dn*gCG5C-q%sC7$b*
z1b7MX42lJw1)fn!gqO(U@b)n+#`O*Mh~X0scQ`Eky`y0zuPwy={eDG^fb8`L{9(T`
zq9N_xa8KCZr==Vnp+F$7Ar$QQ4~&YQaJ)Yh9Pzl4<i+CLtZCX4HKCxQ5mXz3N<j3}
zhB9X0PAqT8#7yd@Eb?(#y4+jrW7G0MabemlWK$%I-ZRO>ta>Ng$`j-!XOgs+IN6}A
zD%t9|3GG$VMhn--#7*_iua%t9-1#giVyzdEt)=;iR0*P$%(OgOx-tD0+!<1t;Y4f8
z!o)3g)$dCKj@zK;me;|%?)FlZoGnX@R*8KMs(H;?bCk=%&t;dHCYgsCK}6mt|B*!&
z-d#J+;_hJdg49=d*&THcBNgvy+T>5|Fep7P<A2)(r|h_k;M3()t%>69QmP+T#tPbg
z52_cMDeuKJHL<PCBd*7hMUTxW=GAz6RV=>xKH_FgoUrQ^`Jk#g_kFnH12PxLsMY={
zd0&wEQog7f7`H5c_5^)J7H!MlizdGk;A$ByCck`ZM>&O*aVT0PAn5%jCdjO)HF`}5
zdJ_n0X+fPUs80p;lb9hhTS1m;N6^I!x?Mq+C+H3YouHrt5_AgUK8iP8{!wj1U;bSk
QjJKtjQ%os|a(I3DKa|K$bN~PV

delta 1688
zcmZWpTTfh76h3<xro$j3!yTDn7%szHXrV0_El3MuxfG_zKwGBBrR)=%3Pm?IYMTid
zXj3j;V6|Xd+ol$p_+X6ECjJ3^^MMDG295ExsWDz2s&9U4I82X`Nj~=Xt#7Zj&pvCN
zug6wLoqZV@4h?^wZ!Qhy99(j`#r#*{7sOQIOiHY%Rg?9yVOEn3dJ(uA{3Y24-k9JX
z@PqOY_@M+Z25*wh;LW-?!x_9#UY0FTT68aX3HU4WF!<pF_kp*{Ht;sxhj=M?yX=_N
zresG#D1&fBcEZq^*ia7MB_rSwqeKOiqp}-Hx1so<yefO3^cYGdl&I{5(rYLID1Gu6
zlw*1Tg@fS7<q7Z;3Em%q&@W>UV#by*l#_A*%77lmmMZYq<RJK9g6{?&lEdJ`dKKb(
zz(?dM@KXt1EiF+kIJ)t><#E=AEbK@Tne?UmMcWW=U!A7k++T<@^r<Imd7{xDo(p1#
z#*3fZKgQ8<hO-P43~w^L#h@4_8Qx|%$M7CamlfCsv3#u2!{TDf$}gm6y$>?NLenNK
z(CtFSY18W$ar)a^o_!uth-217%xO{Q$>q<X=|CEFmc(6CkgH95r%X`~<@owtGjQxP
zIcEOj_{P`kx(G*|$#F61I8geoxWGpa#NlZ$d6-9ncGZgis*RzYAx?jl*5+QuvYyR0
zEbPLWViW3eB58M7n`<6ovnkblvfOuN_qWTrIDNax6Q{NElOn!caVd2Xp*C8mC=`oE
zN;mybktG)RoUW^g_L??c-EjHyMBxhL<1F($*~QLJtr)fQ>5a-3+Xo1$59vXrZ`Vgy
zMuJYN@#T2b$E+_gL;+il-lo>*P*YFW(H=$Q41~lLu3fZ>;0PCa1`E4z;I~~!tr{my
z3lt!vYcV0Um_<*S(PCCT6=;(J{b$)q9X&mw#v{R96b^dD9H-5`hAm^9cDn^|m)DTa
zL-&Jya5zF`x!2)%haKDZZ4>ZZ-ziB$p`aM1xlm*F4ftlBX0i%(!+8EQdJ>v7-TflF
zlI^%2_NDV1QAZf&Xfs^5?6+nvu*nW-`xQIL=`W!JRioLrq0!SiXzAO=Y25TnRgUqh
z?!dKbs&i-OEF1N^uL#p&ZkbGR`e)D2BEIpkdP<~zh731pU~iO~Lb-{N_<rxSsbPOI
zZ-h4zwEn+g`HJr%_#>N*DN9#(lLvmZZ>P7`;Cf_Axt8?w?awnFY8{?mlOC&DPkO%H
z@#Niu=TDP|d9a2YwKd-Nu~f4RmlzU_x6G?g7;aI2?dy@$t_i7+DgKBk{yZrD1}GkL
z#gnXf`V<eD;!#mN5sLd?aepfACdCb-xEs_>s;MhT=O<Hqbaf9cm!G+1Zy2AD=f?C#
R98;TIA*wqovdI2?=wCPqhH3x+

diff --git a/app/migrations/0013_charm_rollconfiguration.py b/app/migrations/0013_charm_rollconfiguration.py
new file mode 100644
index 0000000..f69e8bf
--- /dev/null
+++ b/app/migrations/0013_charm_rollconfiguration.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.0.5 on 2020-04-11 14:23
+
+import app.models
+from django.db import migrations
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0012_auto_20200411_1414'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='charm',
+            name='rollConfiguration',
+            field=app.models.NamedForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='app.rollConfiguration', verbose_name='Roll Configuration'),
+        ),
+    ]
diff --git a/app/migrations/0014_auto_20200411_1428.py b/app/migrations/0014_auto_20200411_1428.py
new file mode 100644
index 0000000..e0783d0
--- /dev/null
+++ b/app/migrations/0014_auto_20200411_1428.py
@@ -0,0 +1,38 @@
+# Generated by Django 3.0.5 on 2020-04-11 14:28
+
+import app.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0013_charm_rollconfiguration'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='charm',
+            name='modifierAbility',
+            field=app.models.NamedManyToManyField(blank=True, null=True, to='app.modifierAbility', verbose_name='Abilities Modifiers'),
+        ),
+        migrations.AddField(
+            model_name='charm',
+            name='modifierAttribute',
+            field=app.models.NamedManyToManyField(blank=True, null=True, to='app.modifierAttribute', verbose_name='Attribute Modifiers'),
+        ),
+        migrations.AddField(
+            model_name='charm',
+            name='modifierStatic',
+            field=app.models.NamedManyToManyField(blank=True, null=True, to='app.modifierStatic', verbose_name='Statics Modifiers'),
+        ),
+        migrations.RemoveField(
+            model_name='charm',
+            name='rollConfiguration',
+        ),
+        migrations.AddField(
+            model_name='charm',
+            name='rollConfiguration',
+            field=app.models.NamedManyToManyField(blank=True, null=True, to='app.rollConfiguration', verbose_name='Roll Configurations'),
+        ),
+    ]
diff --git a/app/migrations/__pycache__/0013_charm_rollconfiguration.cpython-38.pyc b/app/migrations/__pycache__/0013_charm_rollconfiguration.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9992da99b5afde0e3e8789e09f95bb198349adb3
GIT binary patch
literal 772
zcmZWmOK;Oa5MFz2$1y1{2~|i%;_6GBgd9=TD6||9IZ(Lxz{<&NU7NKx*bbt-!nFr}
z27ia+Tsd*(hJ?zj-O?b&+VRZnJih(r&CX81NPd3%@;0&=`)-_VamYEKQ%^_%152^k
zqQ9-|g2&wIVovNnXTZVv%)pU6_dfC11M8TD?hmSCi_pTL$kHllGF{dy6WbPp;ebxP
zPfE5EVjHZ~in(-h7i{3t%X_&G4)yQn0ok|m0l45n@4^NDf>Z7e^l4&%{g>C1LK}Iq
zUgPd)G@giL(`YdnO-7^Xcr3=#@f6+FX;Kw<uhL4*b$ODdn-1ga^9NKo{4aif{}rV^
z{wFtd(Os&fe1}fCQ40II6d;vsB-)L}!3S9_buC4i6f)#Qgr?ipqXLSddy+{7i|{u3
zqKylIfe@6pQIhO|5brmMGP%YBxt1l!a+S%tqNOqPX8=d0M`iYfUOS=2I}56SBVEZX
zEnmnp^dL{lRHF?`^jnCu4(!cm$Me~<Lk#p<UajaWtM;f>t9~6ur@D|)ql;*mW=$kN
zCaRGT5kt|<RwE+$iD(HGhPTx=pTqT8#i^lBr@m_pZeKdCW7+iW{dO+f+prf0hV~AB
v_n3Z%c?iqytq=eDS82oRhg7=;v6*s%y|W%s4E?7aq5CGI_DK2G!1DPY?zY^O

literal 0
HcmV?d00001

diff --git a/app/migrations/__pycache__/0014_auto_20200411_1428.cpython-38.pyc b/app/migrations/__pycache__/0014_auto_20200411_1428.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e1bf48962fd01098deb3412514b39b2fefc56061
GIT binary patch
literal 1026
zcmaJ<JCD;q5cXr8IIjyyjs~u{))a9PA_NjbiIAX5io2t6!OF?(<(yl4gYBG1T4+<y
z@(=hwRNGP^@e7c6jO{#phs3UScIQ3w?Yybg$_lQNub<vNGZf`p!sHi0W`HMpgai~&
zx#FmJYh3enM^}~C3g|#SDnOV%Cm(c&fO@W2#&@(=#+E9}zBdcq*b_lCO=S61LuP;{
z`iz97ksS@xnd<0_%ni^$XN7rjZUVt=Kmm#y0_J9?E#<UjsNB(3bJ`jl<+LS?T!(ub
zZJVW@vur?fXE`&RGPJOpV_6#Qy0A2<yNiW$(&=;`)9IBP`ZN@rPepL)&6ZiK(nuAu
z?hEiPJr)ip9{1wa#kz&Q?K{$SD^q(cIvs5tB8y04!rkCnl3>ZX)M6p4H!Pfph|$3H
znWZDP0vJy@v_hFQFc}Bg*k_32(3>n{w!VKW@m|~-?w*I#@@VIN9^=nV*Uh}|R@TVw
zT*b1H;P5h!gQbNP{MxXJB&*;blXdG1y-shrMPsWXO`0}FsVq~91uZ$lca_q2OP43j
zCLFK@3xEYv#4gk@i!_G-uM!Z#WOijCg(#B8WAuQL8>}uwLQ@l2Ib*)KVHr~v3$~rq
zFG~0zsXHM*2lkclnH>w?ZqK~fX761dGq4d9`!L)#&O@KN%UIA}r`PH9yItDt_nx*F
zt5C-<MLf|HB&M$YAqG)3+|6JAdHp72Z}lUMVc|e-zk=~7Yp?`!H<*bwOw#^SyF>BW
V>mjC<=JO217fCfy0*<Lx^}m($C6NFC

literal 0
HcmV?d00001

diff --git a/app/models.py b/app/models.py
index 337dce0..c1119d3 100644
--- a/app/models.py
+++ b/app/models.py
@@ -229,6 +229,28 @@ class DieField(multiselectfield.MultiSelectField):
         kwargs['number'] = self.number
         return name, path, args, kwargs
 
+class NamedForeignKey(models.ForeignKey):
+    def __init__(self, verbose_name, *args, **kwargs):
+        kwargs['verbose_name'] = verbose_name
+        kwargs['on_delete'] = models.CASCADE
+        kwargs['blank'] = True
+        kwargs['null'] = True
+        super().__init__(*args, **kwargs)
+
+class NamedManyToManyField(models.ManyToManyField):
+    def __init__(self, verbose_name, *args, **kwargs):
+        kwargs['verbose_name'] = verbose_name
+        kwargs['blank'] = True
+        super().__init__(*args, **kwargs)
+
+class NamedOneToOneField(models.OneToOneField):
+    def __init__(self, verbose_name, *args, **kwargs):
+        kwargs['verbose_name'] = verbose_name
+        kwargs['on_delete'] = models.CASCADE
+        kwargs['blank'] = True
+        kwargs['null'] = True
+        super().__init__(*args, **kwargs)
+
 #==============================================================================#
 #-------------------------------- DICE ROLLING --------------------------------#
 #==============================================================================#
@@ -364,10 +386,10 @@ class itemArmor(itemBase):
 class charm(models.Model):
     name = NameField()
     description = DescriptionField()
-    # modifierAttribute
-    # modifierAbility
-    # modifierStatic
-    # rollConfiguration
+    modifierAttribute = NamedManyToManyField("Attribute Modifiers", modifierAttribute)
+    modifierAbility = NamedManyToManyField("Abilities Modifiers", modifierAbility)
+    modifierStatic = NamedManyToManyField("Statics Modifiers", modifierStatic)
+    rollConfiguration = NamedManyToManyField("Roll Configurations", rollConfiguration)
 
 #==============================================================================#
 #----------------------------------- MERITS -----------------------------------#