From 819c423af1292cf478b3aea40be2e4b1507eacf2 Mon Sep 17 00:00:00 2001 From: Renoj Varghese Date: Tue, 13 Sep 2016 15:35:34 -0400 Subject: [PATCH] need to make buttons work --- .DS_Store | Bin 8196 -> 0 bytes First Project/Assets/DnDBattle.unity | Bin 44696 -> 47144 bytes First Project/Assets/Scripts/DNDFight.cs | 76 +++++++++++++++++- First Project/Library/CurrentLayout.dwlt | Bin 49124 -> 49156 bytes .../Library/LastSceneManagerSetup.txt | 2 +- First Project/Library/ProjectSettings.asset | Bin 44449 -> 44453 bytes First Project/Library/assetDatabase3 | Bin 1575916 -> 1575916 bytes First Project/Library/expandedItems | Bin 4152 -> 4248 bytes .../00/00000000000000004000000000000000 | Bin 4325 -> 4325 bytes .../00/00000000000000006100000000000000 | Bin 4325 -> 4325 bytes .../00/00000000000000008100000000000000 | Bin 4325 -> 4325 bytes .../00/0000000000000000a100000000000000 | Bin 4337 -> 4337 bytes .../ProjectSettings/ProjectSettings.asset | Bin 44449 -> 44453 bytes .../UnityConnectSettings.asset | Bin 4192 -> 4192 bytes First Project/Temp/__Backupscenes/0.backup | Bin 45400 -> 47144 bytes 15 files changed, 73 insertions(+), 5 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index acbc0ac16d245c918ec836c7282b1221cec40c1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMU2GIp6h2>DV3!Fnr66UY=|W?R(!@pnF~ar-CIcSbupomqFLE!Z^H z7d2>56JuhGLI9N@J}LesJ{W>gW1b}xG070qA&x1Op**L`9uS5iOfjIs*`5^cjOh@^6smB73MYhjMwp>M-ksx;(w&f2 z7}XI25d$|fAaeIvw1sTW+WiUnyG3~la>ITh=Xg2x`YTs(Y(Ge)E~BixV%qc>vG`0) zeDunh`#bu*;f}xv2K{EExL5XU)5?YIj1lyg+MS-~+-MuQZrd8p>hoGWH!y71Dvk@? z*JHb;H{9$Ex~9LcL(SJ?n?Zk8pPwmOLmZkhT&vsm?VRn{!J$}Oe6o7=$jGX7smA2W z2UDYs$&s~dxxH%T+R;({SS+^azST`T`wF9nkDoaC&b#lOI(J^Ng7D2kRg+ly>h=^l z{!m6yRCcCB(NE(j(q<(#Z`oSawk@mcgTA%fa*V(pvRaM6^0WFJpPAd1_uTM-dh(t# zIN-9SGH*EfL3Xy99H+y6T6yP-p5tUZ-wtfg?duJ!gMqM#i6)qO_xN5hXpxik+C0DV znkz`#RS>~`w^j5R=l-lqQ$iti^+f` zOA}hB&x_ZM(6PQj(>kBzzq;;+lP+)65?zjwvmD)wtFY7xEzvWi)~;_42UpM261{nE zV1O6xhhytEBoYV2ZFd-cu&ZFXyri$iy*F-3H}R6DdagbZ(`1@rp|QG>80yl?RCC-& zN{#5^@T#E{HB&nspaLDD7wL66N*~c#`k20?Z|M?Uq2K5#{Z4<-HTn~TS(pPIl}Ml- z4OoU1Sc7#~j}2%+8``lQJJ5x_*pCCqq8|km;UmB(p2PEa0k7g1j^hMQ;sbn$FK`~; z;|KhR3%G(`aTV9p+R93*ZZAEELR@FO&BkX{ha11_wOgyYc5B#*0%bQb|rqu_QIA_6hpF$ckUIxJIk(V#Qhqr;?LCL+p{5^j@;G zwpNcx6^h{c2JV*eK2g@?jkTIyE_Z{lve0YwX;Sy1yLyeL=@oKki0+1m*g9Qq0MXr4 z!&c&5BRVY&JQ4U^I8Lims`s|q{e~{kFH*PH>2FNKOe{c>72C*a-H0@6wH2H32r}4> z4s^0wvoMfD9u8dA>{G1T5!UQ87{jwTjF)f(FXI)wfj99M-o{a!!fCvZGdPP+@F_mS z=QxM&aA}fyw@*^<&lCGm@82*W&VDY{BLCk!_3!`EDXJm{A_o4S44|U5qqUizt@K@C z@?(lzJIU9he2F6b#uUmBu4FpSDARGq8~-rmc9LC1Ogh9dg*?LLKmQ>>d_#=Rf2vD| O-(I8hU+VB~tNsCJ@;f^K diff --git a/First Project/Assets/DnDBattle.unity b/First Project/Assets/DnDBattle.unity index 32138852afe3f6f65e506626423d02eacfe96cfa..6799df6183093332b13d1f3c42a6dae6c76a896d 100644 GIT binary patch delta 2850 zcma)8Yiv|i5T3i;)}=JHrH^fIA8ciXg_d^9qqJLSw><1ZuvCh%5NOI{=_6&k-EN;k zcdNFk8nI*q8$=`urWi0K`$M9^Ao!yp0gal_5XBY#7>uNeK`H`u=H7F$-u>fAX3shE z&H2vUIcMhV$WMmRNkala-+h4dHUM}UAdqk_VY4aq=5T4rg@(?bFP$p-=GIHim1_vS z0-<5s1_NG-bxFlIdv>K%hBfrN9^a$iD!fgd|AE>5SK=j72yQc!i(9zgr1)LEKQJ{!#|&>1z+oT=?3f*K3c&1f>m<8Sj~(!X|EsyEAgvs=D;dK)o4V)3xqV2NTe%!qF3ELMRRty zoMfiEA)$Bb^j`>lg--vq(63hYxNCkvV2iukUj{9$4dAWXxz7z=SChZGwaMde2k+YF zE5Tc_dpEch$o((mX2{KuvZ}`Ko3U`c$FHp2*xIG^uBL`Yg=eoy#MT;DroWxdnUBr6 zSIn7vZ|Fi?&K{`_fAM~nZZxPN^+7ay5B5J!#&bV`=h`x)U-4>Nh9Mya@3hG!!!ZCO z1ceouo~912Z$Gwxd)re0%P7W==n#B#MY&A~tR7eSGNd8g>dVNo&jP3>?4e@E!3Vha z?xc9e1lkmX>{1MBCLqI-{I1pbu`aP1EoS4HSk)mLCNr_QLw0zxBG)xk z?yTc=rtHXT-6$~UT>O$)8t38-Vws#9$#Scv(!(r6mdK;NEwJ-BnBOTI!a2C1Q+Cup z6Up*jdaajPrUDEG{d4PAp+-Bum$pT^-EQ{cPl^bPH^3KE`*+hKc#O zs7rRZ7DQg&9b3;TEaQZY5?hNR>WS3}%xl9wVhP*uD6upy1Q;W$up+8u`E&=r6p%)b znm(_b0<-1fU1F)u#n^7yF+u6Bzh{XxhkKaCOV?PRNOJ^sVlmcr%ZBmA*h?(c`2erc ziocXRj^f48)p??q`w7Bosh?6XPFRYS!0ZKhjaW_;;2mNqwntWq-xJ&R^NKKGT>XfI z%Ai_N?`qf*EbF0Lw-mSa$d0sSkJW$oKM{D0=eMHYG|jf5CI~%=oeY zK$4ZNIK1d-^7pLsG&FhK`I~k%yLbEZEHiX~7YC9<^?{W!k`dn@$Tf0(CEa$k4BCub z`_MUemJzF`wO63^rPfpRwFSFbi z(TT#GU<$n(bO$ffE2J&&ZFBbQ|{e!CL@3XL%R*g>cQmg!$mrA5g z4sS8?Q-UoYh7A>fRUc)Ws@z=`{%?W(eO48GGEn>;h{J=J9j!zGrM{HZAbrF5YI5-s zfQ9~pPFAp^IQFq6WPSZ&_D21Y^P9Z6wWUSVvo*K>d-zx%cn5={KS~hVak@16ALRnV A6951J delta 1600 zcmZXUe{54#6vxkd`{91kz460!udJ{+whnYuM&hWE4T4z%VK%UkVmboibdrozY}X%K zu?8^%jKQ5P4l!mVGcHC*NB>|kY8w7(G!XC)V~CQ@7_%(6EdI(^!1=we_m8IUB`5dY z^Evl>&pq#+H?^pa|DtL{gZqfCjT2EN-j7ae2TIm`f9dR>ecz-)w_5|ZnoIY4H-mOh zckNU8W|>=Yad~-XX*+xsFgwq-R`aQHhq8w+!@pPh8w|f%;ZR=UEfwwTe$K)3mWmDj zu4DbZzq*lO{1b`EJ0bri*zYpew|sLE8>T3DFgx-0;6YT6Bo; zJ76A+kBlt~g^T`?Y$NvsZOTQCKqFI1^fg$blB2M zdOQv9kYU-#hca?TG9Q>vR%ThUISYRPm3Sq80hL93`*#qPTa;aIq+fuG!nh;idSndC z?yy@jt&0DHihDKdVcq3lO>`DfxhkX2M_z=BmcY`6f>6q;j7gSS!zaVKdS@-4hsx4g z^Y{GxcC<&Rgx8sKnUYL%gB>_i`8MQ(Kmx?c$j6)#_jtSJl0+2RKN6zd#y{8dzUdFqHxAm&}evX%E8zG|#X zf#vs3k7OP7Y#G$mxq99_h%-E8z9BnTf+4Yc1}q^)!?HWHOLnn=PeWy56Mqbq^d@sX zwS!|3EF@2(xe`^9%{B4@RICmz8`51JXpQ`PHZU*|6)I^kangrIR}}~sg(UMd^N}H4 zooeRjkbcODzuFjRZap7Vy(t=r5@3@UGlpeP^oL|#v~vD`X+bi2hUbx>)?#koNAG=U zNVkFIm;AA0GcCL`rmLQ<{BjJf?KG=2_6JWRCrW_jm!L_qwrBYoRA?K2he2yi{vK;n zlJ#%T7bukMKhs`3GFrsb=bHGpbKN`#nT!Ac diff --git a/First Project/Assets/Scripts/DNDFight.cs b/First Project/Assets/Scripts/DNDFight.cs index 752335f..ccbdca1 100644 --- a/First Project/Assets/Scripts/DNDFight.cs +++ b/First Project/Assets/Scripts/DNDFight.cs @@ -3,6 +3,7 @@ using System.Collections; using UnityEngine.UI; public class DNDFight : MonoBehaviour { + public Text log; public Text pName; public Text pHitPoints; public Text pDMG; @@ -16,13 +17,14 @@ public class DNDFight : MonoBehaviour { public int pHitPointsInt; public int pDMGLow; public int pDMGHigh; - public float pAccf; + public int pAccf; public string eNameStr; public int eHitPointsInt; public int eDMGLow; public int eDMGHigh; - public float eAccf; + public int eAccf; + // Use this for initializations void Start () { @@ -35,6 +37,7 @@ public class DNDFight : MonoBehaviour { eHitPoints = eHitPoints.GetComponent (); eDMG = eDMG.GetComponent (); eAcc = eAcc.GetComponent (); + log = log.GetComponent (); } @@ -44,14 +47,79 @@ public class DNDFight : MonoBehaviour { pName.text = pNameStr; pHitPoints.text = "HP: " + pHitPointsInt.ToString (); pDMG.text = pDMGLow.ToString () + " - " + pDMGHigh.ToString (); - pAcc.text = "Accuracy: " + pAccf.ToString (); + pAcc.text = "Accuracy: " + pAccf.ToString () + " %"; eName.text = eNameStr; eHitPoints.text = "HP: " + eHitPointsInt.ToString (); eDMG.text = eDMGLow.ToString () + " - " + eDMGHigh.ToString (); - eAcc.text = "Accuracy: " + eAccf.ToString (); + eAcc.text = "Accuracy: " + eAccf.ToString () + " %"; + } + + public void Roll () { + pNameStr = "PLAYER 1"; + pHitPointsInt = getRandomInt (4.0f, 24.0f); + int pdmg1 = getRandomInt (4.0f, 24.0f); + int pdmg2 = getRandomInt (4.0f, 24.0f); + pDMGHigh = Mathf.Max (pdmg1, pdmg2); + pDMGLow = Mathf.Min (pdmg1, pdmg2); + pAccf = getRandomInt(0.0f, 100.0f); + + eNameStr = "Enemy 1"; + eHitPointsInt = getRandomInt (4.0f, 24.0f); + int edmg1 = getRandomInt (4.0f, 24.0f); + int edmg2 = getRandomInt (4.0f, 24.0f); + eDMGHigh = Mathf.Max (edmg1, edmg2); + eDMGLow = Mathf.Min (edmg1, edmg2); + eAccf = getRandomInt(0.0f, 100.0f); + } + public void Fight () { + string final = playerAttackEnemy () + enemyAttackPlayer (); + log.text = final; + } + + string playerAttackEnemy () { + string result = ""; + if (getRandomInt (0.0f, 100.0f) < pAccf) { + result += "Hit! " + pNameStr + " hit " + eNameStr + " for "; + int dmg = getRandomInt ((float)pDMGLow, (float)pDMGHigh); + eHitPointsInt = eHitPointsInt - dmg; + result += dmg.ToString () + " damage. \n"; + + if (eHitPointsInt <= 0) { + result += "Dead! " + eNameStr + " has died! \n"; + + } + + } else { + result += "Miss! " + pNameStr + " missed " + eNameStr + "! \n"; + } + return result; } + string enemyAttackPlayer () { + string result = ""; + if (getRandomInt (0.0f, 100.0f) < pAccf) { + result += "Hit! " + eNameStr + " hit " + pNameStr + " for "; + int dmg = getRandomInt ((float)eDMGLow, (float)eDMGHigh); + pHitPointsInt = pHitPointsInt - dmg; + result += dmg.ToString () + " damage. \n"; + if (pHitPointsInt <= 0) { + result += "Dead! " + pNameStr + " has died! \n"; + + } + + } else { + result += "Miss! " + eNameStr + " missed " + pNameStr + "! \n"; + } + return result; + } + + + + + int getRandomInt(float i, float j) { + return Mathf.RoundToInt(Random.Range (i, j)); + } // Update is called once per frame void Update () { set (); diff --git a/First Project/Library/CurrentLayout.dwlt b/First Project/Library/CurrentLayout.dwlt index c6aac68a023286ffa4091b5d0b79eab2d16cbde9..6f3c53f826e5a0dd47d1ed5d6b6848299cd783e8 100644 GIT binary patch delta 347 zcmaFzpQ)vRnS+60?JEX`11uXkrmSHsm^^olxU7Hx149NQ1H;?@|Nj>;urYvu2$*DG zsMvgQO(i3v!DR1sO3Vz?oHrM&<75;$An3xt@XeXwLX;arMzkA9t>5O}_43S&{*%{k zddhpjiGksh6N5vQD?>o_=J}f~87K4X=9zq97suq7Z3{N{Y~8>jcutXl0fbqgHl3U7 zyX*I4fpsj5Op^n5>w{R68+KW2-m$xd(ellofB!+42dH?H-oO9f?*99)_v+t&gHI6g zW!C@yPqO*{e~In?|4a`5|DX8%|3ApwjLCs}%h;R}OGfGP!4e1OWHP Bhspo| delta 363 zcmZo^V1DwSiGzV*?JEX`{ZBS>Oj*O|GkNYBaoG?23=A2J3=D7o|Nmdaz{UUqB4Cn% zA!75zHIC_DKR&&yKF94$H^$-An3xt@XeXwM3fstMzkA9ZT9Bg_43S&qLbHd zddhpkiGcxxt6YJ2^Zd=0jFaDN;hFqoi-Nu)uYm&yUl*F~d~dzBGt?e9^{MXRp}6Ih zhos)+J8#Qk+-$s+lU4AHA_D^mvp|)dne4mk_v8iZSXh}rB9nc0>rdKkv3bYt7Dll% zzyJRSVP>ENhz2Q0Q<~hkMQiecz20oj`MF7nC6hnyl?NL(SzzBpbp{M?`k*E=QoC1C$2IJ4~Lq%VP3@4JMPkvtgbf}d%&%`>o9r!emw7&r))uv8?qIvNIa}0~kr&7aXMh5w$&F&dn=gpX zU<9e(oGszX4q`NKmT%uI&j`d!K+FupEI`Z(#B4y!4#XTl%n8I?K+FxqJli+R^O|Z4 zh6=o0cJ6!8qj&d>KD2TzoBMxyV>hpGJC8Rn5c2^sKM)H5u^kvtgbf}d%-@b&oa`-fmw8g^mC4$ow#?U~u58X0b!FrQGQt_4KxuNLnDFKc zVlx;a@)EA>%r~O0G;fw~-z?7v#7scU48$xz%nHP8K+F!r96-zo#9Tnk4a7X#H_P*y zY76r0&fU(n+a diff --git a/First Project/ProjectSettings/ProjectSettings.asset b/First Project/ProjectSettings/ProjectSettings.asset index b0da325e4db2018a05599a152fdbc8ec32cc4e04..44e5ace003c00a64020be026557396ecbf6bc4ea 100644 GIT binary patch delta 35 tcmV+;0Nnqf+XAKA0tf&AoZbKct);OD)SLmOv)!D-4U=%H7_+ph?E(~T5M=-W delta 40 ycmV+@0N4Me+XA860tf&AoZbKct)a09)SLmKv)!D-4G07P002~Sb!D@xs`&y;vJglB diff --git a/First Project/ProjectSettings/UnityConnectSettings.asset b/First Project/ProjectSettings/UnityConnectSettings.asset index 577697e0324f443865060f7d263a464ce1c7414d..33272e86f992f724717ec961805ebf4b6f2dec9b 100644 GIT binary patch delta 20 UcmaE$@IYZhhyV`*BLf@&05?YiA^-pY delta 20 UcmaE$@IYZhhyV{GBLf@&05?+uBLDyZ diff --git a/First Project/Temp/__Backupscenes/0.backup b/First Project/Temp/__Backupscenes/0.backup index 3ef5fd9c4182e8359f5c952439984c29865aa2fe..4668cf751e56e90bbd9278fdb14e79ffdb222486 100644 GIT binary patch delta 2609 zcma)8Z){Ul6hH5+%xxHv ziz@~7B3{Z}FE}wTuRdorfd(=wPCa7A?mSs|3g08Vk>hq17Y(wo2`dcsIa@ehuHwUl z@5Bp+x(C_R9h`G8PN>F6i5Yj5<(3H0kOg5cvD4I+P!CZ60Yn@sGvlPyn751|LC>%( zyj*4;6yPR6I7q0DY&jXItcD-pxHAoZhvO^K@S_}e&A?ei$LX6zw36XkL_#&qTTOF? z8L%sj<@Bi zoXu?^|7z&k?TMc?#&-%Wxc!ySN_3(Ye>coxL&5RKNh9mWvD$ADe#Q-ci)hNmPQSEb zC>vmeC`GmDY3ktnt;ZLzUVZ>zDJ|$et+*RVliE1vTJa)DMezr}rPPrF&_vun>NvJi zfV=M|W!8r=KVT7(xF}$m<<132;D&&?RG&vm#7?RnG!3CzS#;_DG_s5X*Zcm%EUrr;%G#)7Cr5NBW36L^yS18uvHn^hG#8 zDxo4gMk+8TGnlm<36||JLYy;gfpwhw#*BAJWx|ZPLCF;^ro$!=MKx`{BP)B?(I+&N zWbXY@&NWNe5|qTSgndD&6fBvsj9%~C##Bb|P^chxjDIEO;&t*%&c$D7c3)|xpQnC% z3-i-kGt;`AbMAS#IwXnh^YDd`?w#=jciF4=Y<0qt|%*Sh_()w_w z%C{xWKBh83oSe3w-*L`nM{BPnHrUbCE4dVVrb=-0jsQ~$J(_tcAya`r$|MSQRrX#&f#YbtJevxK#F1847l1gF`PLfJfCBT02_)ERV zSL2_ zv<15Y1M~^SRD#lPmCQM1Ii4Vuq%;0Szf-_-1G@O{drykF8?G`>fUmB`W8qZ-y}DYP z;3b-^=*bRGyB~#cft^wwp7VD2d)IkA9p1LeXLfY9z35+Pn}GqkqlIxLvMO89VQI8N z$LcL%TQL@ub*vWR<>+X<>y40zXI?cpQ{|YIZ`M*}wp;szR7qxm=*iaa_B3txwsoQJ zV1tg;`QgKJ(Di{)fAy|hOHWGe@czQ0ROw_I_xMV(@cn&7RP!l+_?j0#fwBEE+Y40) z`}b9%DPlz5+j?vmPH3PIv9UPqDallvsmh&-Q(f6k+^l0y0WLhHh-(0iA6fN{Z9yA* zh*5~xH8S;sMLzku0UM86XQ|tOk#NzRFs&l7mZH1@V55Iu$u%ry^o`l#x8Eu^Q?A8L yA8yR1rPq3vg|+{CjHpBo$K9ukv;PH6Z;(0w delta 1950 zcmZuxeN0QQ4zdW^cqvS$w1^aEz7yP_9H|!$zhw08| zWc;?ULsGD)sJ-B6!t@l?c(uud{Y7?ZC!Qw!If2_$T-MvA7jTQdyym8?&wco_$08?-aM{C@VY-#u$i;27Q06=|io*F~0Pcux2Zgr5 zer zm2ttr{dma7WMeswl1g)V_WS(omp~6!nIkUK%cS7k6?lbI!X{iJl}S^!%Iobf@8c?V zbGFJGf}1yEr=Q8Im3Y9<6f4U<(be7Uhq%flahYDO3C?A~Z%CzYJudlKRdju}my4BM zeO$$i4gRviU&Yf@71jrse5o3D23Qq50PrEzq`#HHJ+FB9x+tEZbzbr0wBo0=vVY%e{63)i6G2$Ss_(Q$++(T&-6qBZ65^4+aAfGNre zHMAYt1h;6zqok79gddYi{^sls8h4NTX(2?2%j{sO;Ow=yLMmN$EDSOwOv8|Qvjzua z0j`o?r=9esI!8Gi0mghwgYNq5fxY$q7pk<6xXcgKZNaV9V{3@Xk*)Yrh=$pjt+Kh-bCf(m zlDNzk)C$hmfM1e|s}X;s*vUMc z9;wAYM)qJVoQwO1jo2}2#)G3Vw4O4?%^w_;