From ca51347522d2aac2f2a6ab0bb01b1d14835d4a66 Mon Sep 17 00:00:00 2001 From: Carlos Galindo Date: Mon, 23 Feb 2015 23:53:28 +0100 Subject: [PATCH] CEff correction --- .../dungeonmanager/HealthDialogFragment.java | 64 ------------- .../kauron/dungeonmanager/Introduction.java | 2 +- .../kauron/dungeonmanager/MainActivity.java | 88 +++++++++--------- .../main/res/drawable-hdpi/ic_action_heal.png | Bin 254 -> 721 bytes .../main/res/drawable-hdpi/ic_action_time.png | Bin 0 -> 647 bytes .../main/res/drawable-mdpi/ic_action_heal.png | Bin 200 -> 483 bytes .../main/res/drawable-mdpi/ic_action_time.png | Bin 0 -> 460 bytes .../res/drawable-xhdpi/ic_action_heal.png | Bin 315 -> 966 bytes .../res/drawable-xhdpi/ic_action_time.png | Bin 0 -> 871 bytes .../res/drawable-xxhdpi/ic_action_heal.png | Bin 435 -> 1413 bytes .../res/drawable-xxhdpi/ic_action_time.png | Bin 0 -> 1291 bytes app/src/main/res/menu/menu_introduction.xml | 4 +- app/src/main/res/menu/menu_main.xml | 41 +++++++- app/src/main/res/values-es/strings.xml | 20 ++-- app/src/main/res/values/strings.xml | 20 ++-- 15 files changed, 108 insertions(+), 131 deletions(-) delete mode 100644 app/src/main/java/com/kauron/dungeonmanager/HealthDialogFragment.java create mode 100644 app/src/main/res/drawable-hdpi/ic_action_time.png create mode 100644 app/src/main/res/drawable-mdpi/ic_action_time.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_time.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_time.png diff --git a/app/src/main/java/com/kauron/dungeonmanager/HealthDialogFragment.java b/app/src/main/java/com/kauron/dungeonmanager/HealthDialogFragment.java deleted file mode 100644 index 209c3a8..0000000 --- a/app/src/main/java/com/kauron/dungeonmanager/HealthDialogFragment.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.kauron.dungeonmanager; - - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.DialogInterface; -import android.os.Bundle; - -public class HealthDialogFragment extends DialogFragment { - //TODO: convert to method and dialog, without class - - static HealthDialogFragment newInstance(int curativeEfforts) { - HealthDialogFragment f = new HealthDialogFragment(); - Bundle args = new Bundle(); - args.putInt("curativeEfforts", curativeEfforts); - f.setArguments(args); - - return f; - } - - public interface HealthDialogListener { - public void heal(DialogFragment dialog, boolean uses); - } - - - HealthDialogListener mListener; - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - try{ - mListener = (HealthDialogListener) activity; - }catch(ClassCastException e){ - throw new ClassCastException(activity.toString() + " must implement HealthDialogListener"); - } - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - builder.setMessage(com.kauron.dungeonmanager.R.string.new_energies_message) - .setTitle(com.kauron.dungeonmanager.R.string.new_energies) - .setPositiveButton(com.kauron.dungeonmanager.R.string.me, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - mListener.heal(HealthDialogFragment.this, true); - } - }) - .setNegativeButton(com.kauron.dungeonmanager.R.string.other, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int id) { - mListener.heal(HealthDialogFragment.this, false); - } - }) - .setNeutralButton(com.kauron.dungeonmanager.R.string.cancel, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int id) { - dialog.cancel(); - } - }); - return builder.create(); - } -} diff --git a/app/src/main/java/com/kauron/dungeonmanager/Introduction.java b/app/src/main/java/com/kauron/dungeonmanager/Introduction.java index f439f6d..d4e28f9 100644 --- a/app/src/main/java/com/kauron/dungeonmanager/Introduction.java +++ b/app/src/main/java/com/kauron/dungeonmanager/Introduction.java @@ -67,7 +67,7 @@ public class Introduction extends ActionBarActivity { int id = item.getItemId(); //noinspection SimplifiableIfStatement - if (id == com.kauron.dungeonmanager.R.id.action_finish) { + if (id == com.kauron.dungeonmanager.R.id.action_save) { if(finished()) { this.finish(); } else { diff --git a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java index bec0bd3..9339be7 100644 --- a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java +++ b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java @@ -19,8 +19,7 @@ import android.widget.TextView; import android.widget.Toast; -public class MainActivity extends ActionBarActivity - implements HealthDialogFragment.HealthDialogListener{ +public class MainActivity extends ActionBarActivity{ public static final int CURRENT_PG = 1, NULL = 0; @@ -49,8 +48,6 @@ public class MainActivity extends ActionBarActivity return true; } - - @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle action bar item clicks here. The action bar will @@ -60,7 +57,15 @@ public class MainActivity extends ActionBarActivity //noinspection SimplifiableIfStatement if (id == com.kauron.dungeonmanager.R.id.action_cure) { - showHealthDialog(); + if(player.getMaxPg() <= player.getPg()){ + Toast.makeText( + getApplicationContext(), + R.string.maxed_curative, + Toast.LENGTH_LONG + ).show(); + } else { + healDialog(); + } return true; } else if (id == com.kauron.dungeonmanager.R.id.action_edit_basics) { //TODO: try this startChildActivity() @@ -76,7 +81,6 @@ public class MainActivity extends ActionBarActivity undo(); return true; } else if (id == com.kauron.dungeonmanager.R.id.action_reset) { - AlertDialog.Builder alert = new AlertDialog.Builder(this); alert.setTitle(getString(com.kauron.dungeonmanager.R.string.reset_confirmation_title)); alert.setMessage(getString(com.kauron.dungeonmanager.R.string.reset_confirmation)); @@ -99,50 +103,22 @@ public class MainActivity extends ActionBarActivity }); alert.show(); -// } else if (id == R.id.action_save) { -// saveData(); -// } else if (id == R.id.action_load) { -// restoreData(); } return super.onOptionsItemSelected(item); } - public void showHealthDialog(){ - DialogFragment dialog = HealthDialogFragment.newInstance(player.getCurativeEfforts()); - dialog.show(getFragmentManager(), "HealthDialogFragment"); - } - - @Override - protected void onPause() { - super.onPause(); - Log.e("UTIL", "pause"); - } - @Override protected void onResume() { super.onResume(); - Log.e("UTIL", "resume"); restoreData(); healthStatusCheck(); updateCurativeString(); } - @Override - protected void onStop() { - super.onStop(); - Log.e("UTIL", "stop"); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - Log.e("UTIL", "destroy"); - } - - @Override - public void heal(DialogFragment dialog, boolean uses) { - int hasCured = player.recoverPg(Player.USE_CURATIVE_EFFORT, uses); + public void heal(boolean usesEffort + ) { + int hasCured = player.recoverPg(Player.USE_CURATIVE_EFFORT, usesEffort); if (hasCured == Player.NOT_CURED) { Toast.makeText( getApplicationContext(), @@ -166,6 +142,30 @@ public class MainActivity extends ActionBarActivity } } + public void healDialog() { + AlertDialog.Builder alert = new AlertDialog.Builder(this); + alert.setMessage(com.kauron.dungeonmanager.R.string.new_energies_message) + .setTitle(com.kauron.dungeonmanager.R.string.new_energies) + .setPositiveButton(com.kauron.dungeonmanager.R.string.me, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + heal(true); + } + }) + .setNegativeButton(com.kauron.dungeonmanager.R.string.other, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + heal(false); + } + }) + .setNeutralButton(com.kauron.dungeonmanager.R.string.cancel, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + }); + alert.show(); + } + public void damage(final View view){ AlertDialog.Builder alert = new AlertDialog.Builder(this); alert.setTitle(getString(com.kauron.dungeonmanager.R.string.suffer_damage)); @@ -310,8 +310,8 @@ public class MainActivity extends ActionBarActivity }); } - - player.setPg(p.getInt("pg", player.getMaxPg())); + player.setCurativeEffort(p.getInt("curativeEfforts", player.getCurativeEfforts())); + player.setPg(p.getInt("pg", player.getPg())); healthStatusCheck(); updateCurativeString(); //set restored values to the respective fields @@ -371,11 +371,11 @@ public class MainActivity extends ActionBarActivity private void updateCurativeString() { ((TextView) findViewById(com.kauron.dungeonmanager.R.id.curativeEffortsText)).setText( - getString(com.kauron.dungeonmanager.R.string.curative_display_text1) + " " + - player.getCurativeEfforts() + " " + - getString(com.kauron.dungeonmanager.R.string.curative_display_text2) + " " + - player.getMaxCurativeEfforts() + " " + - getString(com.kauron.dungeonmanager.R.string.curative_display_text3) + getString( + R.string.curative_display_text, + player.getCurativeEfforts(), + player.getMaxCurativeEfforts() + ) ); } diff --git a/app/src/main/res/drawable-hdpi/ic_action_heal.png b/app/src/main/res/drawable-hdpi/ic_action_heal.png index 733fbf6a00010032fdadb8ef7420348b0f1cf405..245cdfb37504a339a61d0b28c981de4255f4aa7d 100644 GIT binary patch delta 698 zcmeyzc#(C2ay`=wPZ!6Kid%1I-uDi16gghX8^|3b=o~oV=z@~JjQe&fWGs2n=JX{& z!rSAg!ipEo{7v~vcC1|*ZXzK+j5Yp*>i%4PDCqb6YwsI37f60Px7YgnIjdu`KQ`Ri zy*d3{`Fl&_^k>hWu;^wua^KpTbuz_B-lV}#fO+i#9cSsC3TMpf<(lOJ*z;bL?BVih zp8sI}0oDq3xk<%B(yR)6+b-Ww;5)#g@%8r4TVUt9 zyQ|?k8|REr!4G#87;kGa{gbL!dC=e0P~6NiXBCGB%K?|9_of>h{rco#O#x{iAnc4Ors1Og1+7Ph0ewZ^cK;nZgS^>aVjc zkCw>kc)$LK#)D4zzOVwBcbs!Lo8K1umHc}0r+TT@6*reVPZ#9QIm5YLTfcSv{D(r1 z)-Jky;PajOkRA0bcDq_${b!UltiL^J%ck4})fHk{D?2pZwM1oJ8wno1WB&C>*w0yq zvM)78n7Opba_!A8*~cvRq11l;4QakZFJFq)r@!_zX^Iz0w~9Ez*B*D|U}e>+sW-^5X*yMaTXM~oU^Thj;uq( z2BjAZ%{^iKE9QM+uZ7^8_51VIFY>Bb?Ekwt`rzrE3s`kC{-^I|*)f}G(V1UgG8h;b O7(8A5T-G@yGywp zKbU)MyX!202>DNEgwhgro&DrHb%F{b0|P?`^Ya+pJf>?K`|^)W|H1d-yon*(m-rs} zH=GIyjf~N*2lCD>T)RWQQsjMC!|aL~JC<*io8QfUG+^z&cXy0p78uFcM+iDFFtX^F zFZko^kSRH#EBx@sfA6mR%AM1xU1mdKI;Vst03_*S$N&HU diff --git a/app/src/main/res/drawable-hdpi/ic_action_time.png b/app/src/main/res/drawable-hdpi/ic_action_time.png new file mode 100644 index 0000000000000000000000000000000000000000..95276a397e24fd4073b53ccc1718a123b4427eeb GIT binary patch literal 647 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?Ff zR5aeB!$TnCi;A4m!O17QnyLcyyZW2Cs!ljwl&R6#v9F1pUr9;MX`S5%1tmEbM;Bp{ zgXw?fUt7PB$=A^Kw)JgeYv$Mw*16?hzn{HUa=j#O9OAd=A_meW8O>Y!D`djJWMgO|4^~~it zfr0;%XI?WrR=*&&YxWKH*1C@Vi^0>xg;Pbsd-PcjyR1&~v71q9VED4Vk#XAz`wK6P z_Jv68erM!2BO-aHyyMoF%w6v-PMQ>N;kj@lso>Nn{n;iTdR6~xpJNDSTXNPh?(w}F zj_NEMo?MnHHZpQ3?z>?XyNoAh)hw01rz7%s`1n$de;BU zSirHz>+`<~!8@G4RE5qQVEi3>L3x|AICJ%`cHv`py*|h7mB=W2Sv;pgaQBo)nfE*% zZ!7Uh$!(ZavSEKvtHqgLv7by*k`8%rdY)|aSTMVhv)AU9TF?F?9tKa9>RPYYZd2>Y zUwmcxpAv!nZx{Z4qPC0K^27@MTN5X}>$-O|dEI}tI+nX$Q!a#6DE<18!+-3+Y|E%8 z$}2uC^!>hn?zfNJ`aAe%nJDdR`#1TL>j|F}yH~PDYQj4rc;0U1s$RLca^ul;V&Y1b zTTk?aH2*vi`%dd!pWS8eSxaW||NpuR9LXIqdzio1$6DR0lm5ZLz`)??>gTe~DWM4f Dx~eGx literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_action_heal.png b/app/src/main/res/drawable-mdpi/ic_action_heal.png index f437950ef39268a01aa44faa7b4fee9f5926a0c1..118570d90c132eb95b874d888abe0119904a71a2 100644 GIT binary patch delta 458 zcmX@X_?UTuay{cJPZ!6Kid)GE60D0E_<#KWZ*MM8%~)tBFrA^0MZo)E;Ci+ro(?gr zM_L`;upN0@lnQ z#h9}EnF|FrPLp;vowLx$j_=5)BNhwhvrRi(U~0&B!_}ERN3H%C|&nLP{GD`cp8JDyg(HI+ixx;OE}9%x(4onW%{h)(;E>K064jolq=|kg04~Qlb8U!(7L;L_=V;TXn4%KcJImA)eH;_ N44$rjF6*2UngA>5ug(Af delta 173 zcmaFNe1dU;ay>)8r;B4q#jWH73D(64B0R1i{{OG%RG8*=Sm?_p8;*|i4-PnfDR5wu zV^8VfU{85m=%A;o)5G*AOJg1DBijm@4bmOi6Rx-iW?4$ho$ffAGsU8znTzj%MCpME zWeggE^OhX=G+9K|X@&Bc1`83+^GA{&`j~7@TkQIALrH_Iz}1CrGd^PFT_O z|NsADhK-y8?97ES0_}_&MFl=zx|QUrkjL~$*`bDw+m7+bUWYZ_x!p4xEOmZ7_{VDQ`{6*@@Y6-TH~>dc}L?9i4b4;m3%W;ukPUO zm)gVEuxciA=;o;s-d`6w@*j#`AQi6I*=Qgy#=hi{;bzWheI11j!UFRT1t0j*c#2i! z>nw*Fky#$Hnq>?j&Juj59b38B#lAlKA>$Y%qL6vYX|v1}*`J(GBxWefX!x}_9PM$4 z;lH{=wnMe^%(exSg62ovoWR-<-54>I#dc1Jc8A6qdky`rLWvxw>!&!*CgdvEv6z-H zo(L~l**8%}fZ6xym)r>nnUhQ}?e%P19GJz!TlUM;%l)9n0y72%iwRR^$k^QCV_;xl N@O1TaS?83{1OS$@u@C?N literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_heal.png b/app/src/main/res/drawable-xhdpi/ic_action_heal.png index 3cdb749fb784de3f7abed16f16603195c1d08a37..d947f3fe9afb3561ebeab713e286d63fcb5832e2 100644 GIT binary patch delta 945 zcmdnZbc}t1ay@ger;B4q#jUrq{(6fzN*uqgV|>|KyGpToq4zo?&mBgKRwy*B;i%ee zvQkf}iL1wn>(4@`*Ii9IFQzY9wC2dEH7#)lT6)2+_WXbOi_b>-bm4aM&E~tSi_bC3 zpZlDa_Wb9&H^#>2*Cb|KUgkU7EcezH(TtZRySQ|i6*n+U@y^*@&$fnz_ex!;p+yYa zwMOj+wjNDWS`9C--*Q~r{O#}pVV?BN*|qh|Rx=dpEcSQJ@h&`c#DZPR@>U$zyGGA* z+h$4>n!Vby>-F)2@{G^d@-&K?y?w8?an6>%%sHjEfBLo0-TX;7=X6H3m4$x6_2Q4> zZ%VxzCJW6mPwcZ}2ozZSJhDFQwogm%rn&Lnyvs!%YIB^B`E_2T=-!h>I*iw}U+l5` z%#y-U;2Fp$@jI2{LqsBD-f4jcn-4MZoEAukNn|{h!Z9HvqG1USqne0VLP#4!yiCjw zy9}1|wPFk6+Zg^fiKj|0wOY0NXgcG%lL8B(KPyF^7T*t^va@HQ+=O!7MKLwY@T^pfb}rH9M^@{Zf+UOHzqcp z4Ou2rbLPbvsb9L!CVu{(-zIx#bMzFBT-Xuc+I6nrTa=;hDpHZJ!!cCH57c{OP`?cKy7s!hBXYJWBg_ zKCrPCiG1>PXF|+|$>A&Wa;FKJxM-hiV172^bpCqfI#yomi8{HwSKpo#Qx35aTFoROUe3^h3LYf-4@%n>uRkNj7Zp>`1pqRhW2|*n}rq9R%C67dZV4tdtX&|1=)ACc$y)&A^PLz_|t z_p16$)eEN`*pU9Is=xR_j@|t44IfN67$6{lW7aaxqceBBSrI4wOJsr2`}nAzMm0Kd zJWMZU-Dqc6Sz*etAUlXjpn-vs-M>v zMoem7QO$GX`mJvtln;OZ9scT`@@z(<$t5D&AMIOQl`9E$ exfBBf1J40w7V8-PI~`@LATdu@KbLh*2~7YXPk7=0 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_time.png b/app/src/main/res/drawable-xhdpi/ic_action_time.png new file mode 100644 index 0000000000000000000000000000000000000000..56b9258f91a3d17daea6bd0300d7923a906ed89a GIT binary patch literal 871 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE~)opsY&JW%Ag zua@>fG3TnHh4HR}VzwNfoT4nLE^Ze-2?VMMe!U=fk;#t5GiriJ%cV~j)TZg$ZHWln zmihnk`uB~(eKU{2OnRfX+oMH*LrsM0~$Z1g@m3fMa(;XNW5Y5gY=d|dwrU3Cq%||y=R#(ta0bG zhy`obrl=n=7iK#>jGNbVOvmgeJKM?s4BroUUSQqU;G4kyg0c3&_KmRxC`W`#oJByyMvS zi0i_t%+B0Qt_^;|TW&ToToK?7m+_l6Q=j`6QE!HCg}xKd>)tlr&)ClNCisc* ztYr+fT@BA=xHbe%Jbzt<>#nb{6>D-=!{J%!on_998L8o3EBt49IW?rkWgfk`qk<`` zHtCD@HwN#S0t=F6%{&d2Cv&V{)RnMQ z_{rMUnTH=`?%ZXyq(0Q!;Fs(g-sXa;D+?-S&Cc(5VgKcQLaEY`gLrDaQ|IC2nAgWc&TT&u6P0G>Dl0mFZf@b>me<_120|0QI2i=}SZwHfX{$|3sM;@q zoW;r|hkv@+@wuCRZuxEJdAWDu?guP4Sk0dQtGH9pq4kZGv!7#bTl~g|@Dv-RGwjQg zb5=b0K52@3hilFIe3c{foc^spnRz7R(b;RK?*#UJEZV+9T=ghC32#dM&mgr{s@3$I SObP=71B0ilpUXO@geCw6Ihf7> literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_heal.png b/app/src/main/res/drawable-xxhdpi/ic_action_heal.png index 77aa7b47e7f3c231453c934bae3ce77daae9682a..55a3ddf0bd8ce884207f6cb2fc17e7d900398a5e 100644 GIT binary patch delta 1395 zcmdnY+{!&cxt`U>)5S5Q;?~>PpWdO4BHN}%WkyCuWJGRpQe4_PQFob3N8?*-&kU88 ztNIt+RA)v?es#W?mMDF5U%(}|-}8Ri-;|sszWn3e>wAlzpPO6xzUD*YuY0r2Ki7Ug zSM=@n2;N9@`K-z=)$^_{TIvWIc@J4XSh!wLfhdC@$O#VLa+XH)Rq<&j1 zsoKN-tX1_NOP%&N70dM-9qoJS{&RKypPpSJ9pJX;`%KBy7bXwtr8@7mOP6%cf3LV@ zg3q4SsY`j{H#Hq8d*UL?CZn`ac4uHaW3I{;<^IAbKRs1 zeSa1nZqO65iecV2=|W%4!ov;bj4o#RpH3`#%Xa5N;sM*EQ`bFsy6H^k_G!`=)*NmK zn;Om&x9{+IYhCjNVeO37B4PDAOx)(2eCD|C$g9yyp@cyR^^BPoNJMLuzLPXttI^Xwp?h4wK7kUstMaBG}Tn*MrZkyin?XFY-g@y zI&_{l*?&bMDSYAnr%`4S`>*UWJinXsW?sh52}i|v-^GeATavD8l#niwscBSPRzJ;r zR^O=`U2(~`=LBEOUOKJg{H7Jh+Y%2%{CgUwwOg##ZgOjW>-F#4oZIwu3>K)KIkQ7d zZr;C#O>-@t%h#>zyC^a3(!9=l!RZI@)Mw3L<9QUGb%gigbGBoW&S49__fFe!y5v(z zSMLM$^f^+c-V#0MCA93k&z;>K_($;17wV2Kx&(B}MXze3ZYI;7b%-Ov96npEz z8(Ul&(xZX}W9NCj47qXO{DFfj{zNq&Nx%HmRjo|7SY&pl?tVGD zXl%=U|Ct+}XMg#bXt#II`V9wJSG?KDcIIby?u@4!CL7NeG2P`T(KCOSg?*U;LmZFl zy~l@JSi8jP19Vu`xTo$`Jy+e&Hd8L|kK$Vi(YTc_WDZt^Jo9KjeEm)JvgHE5W-Lhh zRpB2YIseD~haCInPw2Psn`F67dciB1LPf337IAU=4ryw?{?{e+P_N^|znlFMy-t<= zEi-(!oi042TQ5~86t|G`rCs@s8&@r4rf#uFH>^!d-2B+K~{dxJxti%eYnZ&NHmw!pQkDDm@qCZF#`?R*t&%-9>0LRc z>U85OUwO#(l#=3-P3xy!udft&zwt)6_cM*!BbF;q<~i+k|M+ad`DLCq8(v!LHS_$~ z++g*{@qqEgmrC{PmS5lTFDS_NTh`B}_N!XnT(?y})?AVbx_z@n=csj-62JN%C+|ki zoqC_zQck>EXA*Q{F6ZTjc#*Dp`S)uC@66l~5IBqbwBuP-*QY)=7ChkG&bnktj=k`= z-yX^<6C z^hr9t>vE&CW47#KWV{an^LB{Ts5t=XK5 delta 410 zcmZqW-po8fxt_7g)5S5Q;?~>S`@NhBC5}IA=GbMy_DGeZ(S)Vf^+AsK0~w_a^21Wq~1{Q&a zx9mHLZhm37F3EIfXU?sU{>kqpnWmh#xp}6N;j>Y`u^UkqK2~8{{2zW42&!S4%mo>|8fr!>e-oOLM$DA zDtA}5_S>)j({KHV`AgDzQJcD-=k~__JX~X3CSmP$Bl3;rVaNES=bi5Z_GNFr5&rR^ zx+Iei*Cgg2*IiJ}Z_s6zNaHXlx%q`*?v2}Q{qc6IA8&f?`r=q#5`TTn&z^PNOwf>G bxc!Our10^c1rm{g4InX3S3j3^P6L?L< z`OxLq(}yl?V)v8}>NZ-trf10uCpYsh9vyF|y+)NsTrEjqO6lGElxPTIRX zJb%v5;XQl!;ezzE^Yd<|r_IklSarEJ?bjm9w_}|jBos!z_-$7?}yJj9OO+q?S$12m=)-*{1^X&=YzY4?(O0$NHyw? zXWPda@gw3N)A^0!iZ>U{bo(df7j-E8!K)Mjd+C~ti61WhImgss&^@1@@25aV>-6=N zEk~R#b0^4Fh~=xte+!uOHMZXl&P9$6>>4$NpdIPhN0_ zkAr)dX2o_@L7VF?q+hTLpGJkDfQYw=Mald;jk;$qaA38}AZbHte^4 zQ`PhT#^F1spMA7s+_IWU=HrIK==ZA_btldJ!;{CiBR4XkKjrt0cQ&U@KW_Kn`UlZKPkq+>Xm#Pa`R9yN4FBE;3+Z17jOMk_+qhBlqKMNhqXt(ueU`r!nXxWM z7IR*dsfthL$v?vI?~km|;sqznn8Q4d{8jCfIIw6@on!p0Tw@25@^7!Dwk_kGFvpKQ z$9O^Xg$I{sUFKNE8*%3F(~8$Og`$u6Pxdeu-;u)bU-sh3*sZ#3I>IJjnj2lB1lUYC zeqGJzW_-HHW!hr49HB3(FN-l}HQPjTU1*TGxN@#8TSwa~Mt5Eh;U`<&att4I9caj9 zlnlsBD3)9wQe?wXC|$YI-KI-v0b^&n!M!w5UOS!y%@)^LzwIU7OPF#nD^1Fb+Mkji zweGy&g1ap((g&m`zTLdQ%Vipq-j^8$uT65BM1uoDl0S)ZuTJSoHrLvs?wsH>KVEoE zbj!!)qYwDcsy;HcyOn%}Mf-4oSf)nEjI&d`EmtnIJ?68aO!=67-{vyQN= z4i?<=AvE+)*xjY=YCapRB%g1br#8!W**>?6nN7kkGvrjaR156CUgFBA?<+o2U}8m| zG`rEBdCwYKemFZ`4d?R7m{zm#j^!kmQO^Y{<5%a1NVca7M<3+Rvp;D_*F=0L+^Rh0`1e5l_!`lrphu+?9=2hKA7FJ>&Nj1 z-jdkfSwE&uyE|>FjJVlRl@ofGrlxk9FY(=_L5fqf$+9M%0 zPcLt(grLscTK{BGx!Bk>8E$IkkBxqG$WJ@bvaY0Z`@xGFr_A5AvE-=S2Z7jlf6QWq e>7d#l=C@DGbRwE&#xgK4FnGH9xvX - diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 4acb6ab..e3f355d 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -5,13 +5,50 @@ android:id="@+id/action_undo" android:title="@string/action_undo" android:orderInCategory="1" - app:showAsAction="always" + app:showAsAction="never" android:icon="@drawable/ic_action_undo"/> + android:icon="@drawable/ic_action_heal" + app:showAsAction="ifRoom"/> + + + + + + + + + + + Curar Editar personaje - Hecho + PG Máx. Nombre Cancelar Clase @@ -17,6 +17,7 @@ No No te quedan esfuerzos curativos Ok + Guardar Raza Indica el daño sufrido Editar personaje @@ -24,16 +25,10 @@ Máx. esfuerzos curativos PG perdidos Deshacer - Guardar Acción deshecha - Dragones y Mazmorras - Cargar Esfuerzos curativos PG Borrar datos - Te quedan - de - esfuerzos curativos diarios Morir Has muerto Los datos han sido borrados @@ -45,8 +40,8 @@ FUE INT SAB - Te has caído al suelo debilitado, no puedes moverte ni hacer nada. - ¡Sólo tienes la mitad de la vida! + Te has caído al suelo inconsciente, no puedes hacer nada. + Estás maltrecho ¿Quién va a usar un esfuerzo curativo? Yo Otro @@ -56,4 +51,11 @@ FORT REF VOL + Avanzar tiempo + Día + Fin de encuentro + Descanso largo + Descanso corto + Turno siguiente + Tienes %1$d de %2$d esfuerzos curativos \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d8ad45b..d5cda7b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,36 +13,37 @@ VOL Defense Curative efforts - You have - out of - daily curative efforts. - Load - Dungeons and Dragons - Save + You have %1$d out of %2$d curative efforts Reset All the data has been cleared Are you sure? All data will be lost! Action undone Edit character + Time events + Next turn + Short rest + Long rest + Next day + Encounter ended Adventurer name You have less than half of your maximum health Who is using a curative effort? Class Race - You have fainted. You can\'t move or do anything! + You have fainted. You can\'t do anything! Cancel Ok Yes No Suffer damage - Your character has died + You have died You have curative efforts New energies Edit character - Done + Save Level Max curative efforts @@ -61,4 +62,5 @@ INT CAR SAB + Save