From e95d276194381e3c9cf9d877cd7994508102eec0 Mon Sep 17 00:00:00 2001 From: Eevee Date: Fri, 6 Mar 2009 19:14:42 -0800 Subject: [PATCH 1/1] Added habitat sprites. Renamed flavor to flavor_text. pokemon_flavor_text.flavor -> pokemon_flavor_text.flavor_text --- pokedex/data/csv/pokemon_flavor_text.csv | 2 +- pokedex/data/media/chrome/habitats/cave.png | Bin 0 -> 667 bytes pokedex/data/media/chrome/habitats/forest.png | Bin 0 -> 806 bytes pokedex/data/media/chrome/habitats/grassland.png | Bin 0 -> 760 bytes pokedex/data/media/chrome/habitats/mountain.png | Bin 0 -> 697 bytes pokedex/data/media/chrome/habitats/rare.png | Bin 0 -> 553 bytes pokedex/data/media/chrome/habitats/rough-terrain.png | Bin 0 -> 764 bytes pokedex/data/media/chrome/habitats/sea.png | Bin 0 -> 459 bytes pokedex/data/media/chrome/habitats/urban.png | Bin 0 -> 665 bytes pokedex/data/media/chrome/habitats/waters-edge.png | Bin 0 -> 843 bytes pokedex/db/tables.py | 5 ++++- 11 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 pokedex/data/media/chrome/habitats/cave.png create mode 100644 pokedex/data/media/chrome/habitats/forest.png create mode 100644 pokedex/data/media/chrome/habitats/grassland.png create mode 100644 pokedex/data/media/chrome/habitats/mountain.png create mode 100644 pokedex/data/media/chrome/habitats/rare.png create mode 100644 pokedex/data/media/chrome/habitats/rough-terrain.png create mode 100644 pokedex/data/media/chrome/habitats/sea.png create mode 100644 pokedex/data/media/chrome/habitats/urban.png create mode 100644 pokedex/data/media/chrome/habitats/waters-edge.png diff --git a/pokedex/data/csv/pokemon_flavor_text.csv b/pokedex/data/csv/pokemon_flavor_text.csv index 50f6b43..15b65bb 100644 --- a/pokedex/data/csv/pokemon_flavor_text.csv +++ b/pokedex/data/csv/pokemon_flavor_text.csv @@ -1,4 +1,4 @@ -pokemon_id,version_id,flavor +pokemon_id,version_id,flavor_text 1,1,A strange seed was planted in its back at birth. The plant sprouts and grows with this Pokemon. 1,3,"It can go for days without eating a single morsel. In the bulb on its back, it stores energy." 1,4,The seed on its back is filled with nutrients. The seed grows steadily larger as its body grows. diff --git a/pokedex/data/media/chrome/habitats/cave.png b/pokedex/data/media/chrome/habitats/cave.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc9fa912fc783fbed4566f99d73f8db4a1c0224 GIT binary patch literal 667 zcmV;M0%ZM(P)*r}K7}7z+f`}3T+=dWt0YHw|0zmz4 zD%=9X3qZD)0J?y%&KMbYv=)FAfE3@ga?}zp0iX~{BWF|b8i3{UwpuEb zc{~2RCv7$pFBe1-b3DGUM#7}YHG{tM0x&};-Lz=4$;E4yf>HwC1VNS>Z@%*IMZ~8d zcmT*0gF`lO&R06-A954m!TQ~&~7wFI^hFVg@?1#R~##j60Uo1fMI zVo`wj&Cd~H|5H`~mRlS&ul52!JphU24w`Gz06=msHE?eLu`M$UKtiyb1Zin-I)79( ztrEyZEq0QW6)ypxM^UN2#Vr8v2}zYU#G+>c^yAm{{AAjRtmc4hU(?7B1c26udLqOh zx`jc6NeD8ma_!0Pj|F}mf!`Y&0tquSH002ovPDHLkV1k_m B9gzS4 literal 0 HcmV?d00001 diff --git a/pokedex/data/media/chrome/habitats/forest.png b/pokedex/data/media/chrome/habitats/forest.png new file mode 100644 index 0000000000000000000000000000000000000000..8d726e7fc758bb79a9f9e786289b5922db4ac300 GIT binary patch literal 806 zcmV+>1KIqEP)$OhZe`y@Mm zJ55)#=fnQ{;cYj2d91JXbJHyt5*WFR_xw+Z_S~y}ZJq`Br$qO<0P;HLW`#3bXq7Eu zE3*cG)y@j<)XwbvmOYPRMma1lJbQwp`7Pr!v4@=x>`PfjP!?G2)g+of?4WA_kcHLT zW!^eNPWchSnX0w`VB&R)_g<6PgzjD*XYYa310V%~eM92yM=RPon{dlv*$tpYd{l7{ z23muG)GD5W&`X#Vk6`q6$`A-FbO91iKu+RMh5G7EqQPoe!ui52)S&_XU zY(6NDsPl?VY$CF__G_%8t5Z-i<9p5E_g zzZQVZYkww2_`P5eXa$Jy{b@hDT(fV8vH+sPuLeMJD-J*XF{VXo;mCJH7t{_w4}ipH z0F-eh7jdoO^1h!nSwIBpzr6sw4=5G@>bRYPVk_?DsOO}99nvIOw-w6(ka5RKTw7gR zAX_}~rr!s9A&4+p2klM0)pWvMH9e2Ub^Su@RiFk&x&VzA2)cq^4Exv<@BMGcJp!J1 z6x>z;!IExZ=J)vUJ4KMFs2b6pj9R@Hz@qmFv2Dp#lZCVi@d(6Le6{-p^(nrFZ|bhm ko3HkoopBR)kZ)1!4_hEFkBvL)i~s-t07*qoM6N<$f=UZ?v;Y7A literal 0 HcmV?d00001 diff --git a/pokedex/data/media/chrome/habitats/grassland.png b/pokedex/data/media/chrome/habitats/grassland.png new file mode 100644 index 0000000000000000000000000000000000000000..1b6b14b4caa6433734989ae18d76d214fa8fefdb GIT binary patch literal 760 zcmV-R}^Tapku z9_Q=r=CSYyhZpvtM5ztE3o&{@Z%&NS;KPLI33dIR+i)R1zWyd@@mIn|LkAZ`i`4|Y zB|KHzI^^~E-ildG2nyyk4TO^Q`fIQ#Mryt$@TnF}9lXtR1xC=?u}XxTi9PLG3aicS z*&n2T_qH!-e~(GX9Fdy|AeTmM=vvkk-qW_57eV_hu3>WH8*Rk`Xd7RP1W%XO{sOdC z{c^!ZV_weTZbQ1DCvda~O0Q$Zd%`aS$Z0`zEd|WM5xndOt6Or#H$~tlQ zIQLHiq)twP9sra?4S1{iDF5kufL483O)E)Dc~ouf8rmd1^LXM*KT`ndfP#3JL~hkA zc*+5FsFfeL+3x`~*aAW7qU5|w!n^+C4eUhODs=y_<1jQZhoc!@$jgd zYQIv;UCWkF5j+wARnR-x8nIH{P#W9(zhI3v_g1i#aK-Q*5mI}F^|4c9nXD1UeP5s? zIR6S=s|#w2kac%xOKY~q&R=wYu(S(WTkbro?hy9?YH3xT5jZsb9))Q7oY0}+w=Bf4 q=LHW7K2nTbJU4tu=vt!m%;^VbUm1=Pl;hg~0000v8x7ri}3mo%UAzDOe3-`^xHcR_sJ8xo6Ucn%K2C!^q@Xb~0$UxLHuIqwe<;rd%cVG9#fGJGDk(DPUT{Jj>Q5`i1v z+WvuuMolvtu;~r%9E7Wpcq=OYeYx_ltf78E&v4s!8L2T z#v~C+VrU@Gr^{-j01~*gUQ2yOi2z|CJS&2Af-T^s=&2Q9%?|{yWGVrm_obxB2_voV znn>^#V&Nt&B{dB=>`Osl5N{DAL0}SJEVa8P+&OqFNNay?881?@v#xi|ggr#4f##SV zm4HijnhIg@R;viDp2v~B?gJo*#p~8^9VrAg{}%x~YPUs*mU3t9!!f-4KM=8*v1W3Q z1Xl&G6+kmUtJge5kXXoj0+#IF>KV=N)QqKZBzs55TG~89)XOZ(RlF}~t?8SBU!MgU zOPXgzsM*-y`;gpy3jM=S$K71Sju3Cu@D7$+!nP;E4m-N2%@7AJS>0pt3W!JnB(J-} z=c9Gv-XU*Eip}s;Qf#gJy>@!)jNe;`9;Gk#C8^2leZRNG27!kpx_4d{bGb-$Nm`;9#RT{WOh~#jf!MO9$uL5= zt(=@j2rleUQoiS~Zdn^162^B4jkC1?oUXuI!j~kNipVXXw*V6ndy{(*&_n`fQVV#A zglZzVlX(3lS2Cp{ zBx}TMECCV`N5Qosq~JvXR3S$K2Oh&ga77%EP+}4ZC`pjOO9gNwXy6k8d&M;cNVAoI zCkdQlN`^bzDaYh((w@2kgN=BrG8TOrZX2 zpe|PvkHwMDL;$|~oVeE`z!(y)LFT~kIS1C9(k@WF4N3w_phU#*3HYL%v*z1i{NyK% zSVFGl6L1B5+yx~GsvRMXfTz1cbVKg0Yv3sX;vJ#A%?~v^&LxvXZ7l&<#Gy^mLmeQ@ z7IRhE8P-Ni@M`eft#NPBWyV00000NkvXXu0mjfB=YJM literal 0 HcmV?d00001 diff --git a/pokedex/data/media/chrome/habitats/rough-terrain.png b/pokedex/data/media/chrome/habitats/rough-terrain.png new file mode 100644 index 0000000000000000000000000000000000000000..b6ae4f6d892c8b0e04e6d15e1723089d3e99f282 GIT binary patch literal 764 zcmVosV=`uG^hMqxY4etV^KD5kmh9ij|2>SrivaQ3R zV>zFXQ%yaLP-?{v1!Zl~4*{c>=-t7%xA41x*qiXKAbJR3N$)o|6D|fi*DA3y>+Z#8AePws{(75!&hOJ^0JezO8r6hbT~++zb=z5d zsiiFyZw^MsCBnBpD)ChiT5h%{(ReHZ5rBsw0ZaoF7WvQ9>kR-3VPpW-ZsKnMOoJ4* z-VFfO(pKuQ(Pv`+1ppOke|-gDl=No+lyC%d7)@*~h`-J7(RX?Eu#-V}H~{L=HfnDI zaQu7@9eDqE3ddygqms>KLRB`Xk3J9K20#%QiI4iT`B};4wnP~tTFnY%Tzm89sAZfFyuYd^#&5Eb45I+DBBT`E+GqA^;v-sU@?$@A4NRTn2c~0Qi0d zAi8FD6#x|!1pw!J2;uL75jpHr0Q@?y0TV?qt1RVxfJ(plT=mOv6lE0e*H&$2DErY| zFNgt%qFycD17J=vu{8kLvdZk?xD19L?+`O$*UVu%X8>?K+f2RPOiW})`8wC8L9AVO_15UW6x|EP5O0w0QS2`Q_n%->ke>DJj#L6P&qV@{nx#DSY>zIlzzqlWam_r6QJY zm^DVKhJrO)6%=mMMZkz;amWQ`^)oeJ%Sm#it*178vs!veTB@W-YqDie}z6#AP5T1ZqTc zGv)=LG!yI)L<5j!{s+R^9}x-q1Ax-^vz9E?b`LFCs%a-JS?Y3|v}CDsGiu3Fr|YOC z>-9^()fo_lw1Tx|HW_#g@4;uWOxg3;n#1Qhz@>3D(dW#7RFU)skTZnf(Z>MDWo-uq z5F-mhfOP3|^Nx_%^p^wyb!WKN-5>p2Ky>uCAe4TAjvX_0?AS-?V`S`@v17)LeFVmij2S!j5wg(}JyFHAgk)^laOLhl0|Ddz zlQ4$3>l~N!a2+-3_ONKp?g~n7)0=?dWx6>SwT)K;(VB5r5Urap1|e6&hOg^Lm)yo_ z{jlD&dAh)Fsdb{bdaIh3OiRleAYnbp5Y|LNii!mS%DrE}llo748Jd87S|E5_%5^oR z3BcNmS+k{-XiE45Rzg6>PH%WVEKTul47pnm{b0Pk=8qBaXabKqV9Ob}>CLQ6>P6d{aQoh_Cf z_XC=->gD*l8S~SdVmRPHtp%_ZH38t*b+bMmessS3U5{<=1^_j0g|M`(0X01dY5_pQ zhr{En+z_Pgc^pt10Gxv=kqO+k3xM!3DVg_%aPvM;6F@kQ0F{RD=WUQ1)T97d8Z1%s za1M9fk`SWb1Zn_~MwF!>uwR5c04zn{1A_QnFxDw)jGy|a@%eN=2^vq=tE9s^0H$^r?btrfJVu{u zD2@ulETItS=uxAj{|7?=T+}HPTGHc}0K^*2JtAGqQwS0OG#WynlA;Rx;2IVHP{umz zn6k_f&_rKSEdbePip1{wSoA|U-T;cu6Ve!$GNd#Bx7lJ`$0ub-NdVR63tG&V0MOK| zQB8*!1AwAW9BF90iFw0X09x&02Dui1XPdqOXDFv25XEl!00000NkvXXu0mjfHclt> literal 0 HcmV?d00001 diff --git a/pokedex/data/media/chrome/habitats/waters-edge.png b/pokedex/data/media/chrome/habitats/waters-edge.png new file mode 100644 index 0000000000000000000000000000000000000000..718efa150d9e4fe5ff30e5499498640c5a557ffc GIT binary patch literal 843 zcmV-R1GM~!P)ZEmzX;=sIde7>$ulMD`nUf;`n0PCX0f@9O zR@&=UFIbH;0Mr9vO=?eO>P9KB}G$<&z!fe97c9$(MSdadQyH9pHKC#KKEc9(!e0jMLELvpXC zPPgUSJS>Nz+j3aGEsK6w=^iu&%oUG9G3^@5JkJ6X0gPY~hMq3~WQ6Sgy{FP6Wixeq z5#&XdMovn6#@VcpnT8;SdjB_A733~}{r1sJQ?t_Ay!MRg-hCCEUZj4BXO4&+56`AJ zNpJJ4dpvt}Fpt5^0%AkAP2Zp+=%DAkmB;dnJpi*U1J&}?0?>lE z_%+A?ECHf2V$fggea&lOm;mI^3K#(q2;LA`0-mE>of$Q z<^qtz1AvXKF;BF<$i3w+f@%E?{WELH(astN$=tB0m^K#{{i0m V?T*eC>E-|c002ovPDHLkV1lacln4L- literal 0 HcmV?d00001 diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index f804eb2..4c38755 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -133,7 +133,7 @@ class PokemonFlavorText(TableBase): __tablename__ = 'pokemon_flavor_text' pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False) version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, nullable=False) - flavor = Column(Unicode(255), nullable=False) + flavor_text = Column(Unicode(255), nullable=False) class PokemonName(TableBase): __tablename__ = 'pokemon_names' @@ -199,6 +199,7 @@ Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__, order_by=PokemonEggGroup.egg_group_id, backref='pokemon') Pokemon.evolution_chain = relation(EvolutionChain, backref='pokemon') +Pokemon.flavor_text = relation(PokemonFlavorText, backref='pokemon') Pokemon.foreign_names = relation(PokemonName, backref='pokemon') Pokemon.generation = relation(Generation, backref='pokemon') Pokemon.shape = relation(PokemonShape, backref='pokemon') @@ -207,6 +208,8 @@ Pokemon.types = relation(Type, secondary=PokemonType.__table__) PokemonDexNumber.generation = relation(Generation) +PokemonFlavorText.version = relation(Version) + PokemonName.language = relation(Language) PokemonStat.stat = relation(Stat) -- 2.7.4