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 zcmV;r0!97)0nr7JBYy&zNklSL&N{{&_^{l& zvuDnC?>RGP=H}!CEoeat+O=xQWHKK#fKCttt)MJJ8@V9NHh&(29#98v=ybdaOoN}` zpTGrp2Og4h5*q~|4z|@WrK#L(t)u^J6XtwXzGE zE#dMA{LawEIq381e6ND@R<^*Nhu@!pCROK4z_CXGey|BbDgp)#a6U!5ih$P!37Az8 z@ZBH*+bRP78h<3HkKffafX#`W%dY;4*=#(GXXZx&+))5l~FoFI!wd9v5g)F0&7G#J{Ykg>#IhhlnNPpJ`r&}0oi0`lXDBy`7j#h9S z?g^X;gY9!pbo%7{d!;JWMnv4@plzJY39li+>9 zF@M{Vw6bkrC8!o^sfZ~@Dis{-G7-bvH}%9;`I^FO(t%huM1&m*y>E2B10L{oKd;yu z4#Mf_7Jp~!Ni>3A5@$MC#14mE#KC!bs+HLer)Zj~G{qwKiSXx?#Cb~a+N;WmUYnJd z61a-{6iQAvXu52<>coCwx6$G6W0D!G%Y>OJ*Cs@M@XWJjBOq?li8YlF3mL4mQzjm} z7tx&W!g&&!XX?9ya`08+Jgo&cO@9GWXLAyr$TRv}?{SSd5uC5TZm*(Bc%x7IgImGN gxu69tX#Z!s1h|_5qRjgAXaE2J07*qoM6N<$g1%c&xc~qF delta 227 zcmV<90383(1^xk$BYyzJNkl1YF6aON002ovPDHLkV1gv+W5@si 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 zcmV;20(kw2P)`cLD3w1EV#ac2M;159zw1@@E{@{ zL_tIo6v1cwpVqIT0!=YJ+dJDcI|E(tJ8gIM_s!OH*K}T<4I4IW*sx(ZQmIq{Xab{P z32cEKumR>kFQ^Tp@EVW+*WgWqV=`HmYvJV}37$2Db8f&Oh~+}OD3x=M!a2V|MUdj# z!Gl7~1=W8aXaUWjjY?({+$-jtiBb$gd>lME2sotQVrk}=ff2>~BL2}&eu}RHcWhBn z|6`ffF~)zOU5cC72Zer!kI_?>7ZYU^SBx(N!$hlMOg@-(Ffr+efdRJ2KhWtizEm2! z?lMl8SYx>#LAB`vitjkdG;_2J(AZ*d%JMIpH1Lfj|0~V_QwF5XL0;qD*g+=*u;kMk zb22hObB@?LU8W3NvBdR085n2lteOyC$&y}b&huiRk)JIl418fpfB9&j2)s)3{&*4G z3Hl`x%)kNrUC<-8Ll*;kx`z|S-AeOby%=bA>2sWT5xbP)Y2HZVwscHnZGe(=u)k7; zIL!K8@-$>(!bk~8$%aUvn}G?9JlZCVzr;u|xM&{lXN`uJ=Q#=x67TI3_B@}W)lzn%8+3op12nlvK5 zhW?Y%MaWEKKI$FBd{>BA4DGcFd#R&&vBjJ_WUa14*qA5cgqG3&OjA*o9QfGjJG&jF$qj6%acE z@fHGVPXlofv6dS{HJqU`J`Tk4#5kaz2A0EcH8Bp@MMDQ{CV$2Or)cPaQ^YvnC=Shg zfp`{$4%kbK1J>ct90|nyKzxh>2h1kM0ZlmaG8Yg_;*cj6XAt86J1iRGK!pjk05YV& z0V>2efEkDzfw&!tTcJhrG9W$#4T)7`SU!c6k`QExDH4uDGAIaICy-+KNl-mOiUXK{ zcm@u`mH;sy5Pu&b!2t#2R7Mhb3MDNdu7|RZKx@7{JeZB#8c_=x@8}Mw1!6rYy9S7* zf!GfVwx&j#z#LkUAUohN5c5D2CdeUmSR8qPq2#C+%z(MqI zKn5NMWQ+(0WaDu_E-fsK0^({Yt_9*fcpR`Bh-;A4M^S1y8y?Gu#cY%~fP)GS;23ql zkahql5uT*L@{<%LLZ~CmfH)Kh&%|TlOf8eW;fbe8U>?Z b6p#u4G(rDUS#RMK00000NkvXXu0mjf@5)4a diff --git a/app/src/main/res/drawable-mdpi/ic_action_time.png b/app/src/main/res/drawable-mdpi/ic_action_time.png new file mode 100644 index 0000000000000000000000000000000000000000..cf2e79fe4077c383965da766440894ea71d14a81 GIT binary patch literal 460 zcmV;-0Wq3aUBqwp^5VW@e(Axk>tkvYNW)ajzx_ZR6ZPw zoEQ-AgUW+wE>ay}hU9}%9BObn04g7aWJVyV4k$v>tVpHR81eL4wwbixDAgQ zybge>nFCd`l^9F)p+OJATc8?OA&G%79~K9s;xV%cmX3&VfD;g(!c)NXfyxCW^_oC@ z6q-mKDRux|MUR4a%mtUo9(ig6fhLf6U&&0uXHJ_I#%0mxT$sg98x z5Ccu+^lgw}X_7V4y-9|nQEChgcKS6+N5LqdHUI!Pkd&AlJlYNb0000%fBBYy*pNkl2KE+T>oj6w?hp+f75f-LBlq@t|E%B+N5Fe)xn>b(Ey`VKrB%W=0ivp2hYbIt=F z&hutw=lSmJGc(VuVQAB)O`A4t+O!pD>2$gZECV610F+B?yMG3(1P#=FRWUeR2G)Tq z;5|r!l!Yb$z^$H5-~=dBEZ6*lefCb68f{R3=u+xbq1owM>2Y|ChSIyf(I*K_d~>~%|klM;IqO449gH;TwwvmWC)N{Sb(Gq0VWg{U{r$#ya_Tyc)@x1>#2MzNPt=N{f-X;T#&gPZsoY(T`F4vK3Uh|_}t|6 z{BM_ea+;M*qbUs1K5#+%~Ylwe9Y*~8u~5fk@Np=h9BAD zeOWrxMSs7|^=MUj(@h6iuKsKeSdRXCmJa;_v#I_qmz__znjWVBH|U^ahp2wD%L24{ zG0ejbhVp z^!Sunj>CGWouFWF?UnfsLZKqm(Qy<{$D63mQTpC2u-`Cw%5&82wFqH4`OVk)ZYs|L z*lU^^*@zh6be@fzV6n!82*)rUH;=5$gatlVb2`t?C>9obVBE=(N^j4obD8tKf_hbE zhkv#_&b+mx%x2O;#;*K?87owpB0KUp6`^vwIJUPfDy|V&V7p=C*h{d7-U71|AZDm) zv|8*dV2$4;EwSmN2tkKCz=!PRDWepOHagz~oM-EUYNM2ltpGWfx}#vRQHn-EZ!*tx z*JPBk!ND^&x%?JmDi|C+oDmb)G1hitDk>Qqo1=)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$ dxfGD(Il#>8Zc;Wy6 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 zcmV-t1DO1YP)H;^#KgqJ#KgqJY*@Kmo&j3G z9&iN=f!E+8m;mG8F}My6fi+-e5elydN5Clf8xj)dB3Pcs!WV$E;Ae!wy-b7KU|C*@ z?*yL{DBQ~wI0b65TKHVhn?m7Uo`S|KHu(nz$^QWNz)8>rwt!7w2j~HP;FEzLdZsli z#n*vn0SP|>+rc~of7PH3+~8)f^ZCuW2uNTy81_k$hPna<@2m&EG(+SHn*tov6yI<9zef>(-`lH+J!rGzd#^~~0}Y2E{6rOi`h+{08RIG& z0&LZMfv%8#A_>6nHflP>t2P7}Pz0v_V3sWb_NDYJFn#EA{|OnGm32 zn3;@N{2Q=1z<&cZeZ_3D~`9?ktM>X?=`#wq2jghO=l*!yaEL1Q1qqJ`orYhrSXX2`BFqP;V{EA8_mY%Hh(&zwZzRN?LjJGGX~bya x&DP7@QI7F)x40K2#l*zK#KgqJ#Kf{?{{R}T8ih5^9Ap3h002ovPDHLkV1foYn9cwI 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 zcmV-(1&sQ$1BDBaBYy=f$cj< zXe5NyFVRLNnOPb2L)m6w8`-{4(nkB9`ajtjnir?>-PgTy=gysZ?|krq`rey2^L_Wu za^}o6C51pB5C{YUfj}S-2m}IwKp-RrdV72O0ds&$fc3y;;D32w8}KZ!5x5Ol3LF-2 zUDALBz|FwJz)Qeezz*P5U<+_NunaiVcHy&t8+ik}fjutxi;GeP9H6i+lYskxZ(PHz*+@YniIbPD?N05=K`un5AViin@-7aznUaq5x} ze4wE&?1CsWWrnj`LxV9dvq4p;M=EeN@Po#BuMxytb8D;1+;C~v4-iI4>iJ$Kww2(}^t7WAO zU$TP4cH~4I1{@-x9l2450c|9-BaiDa;28<+$U8a=_&`EC@|_L?ev;6R{Gr2uE)qIi z1HO{bj(nlRfHwg|HgEFCqU{FU&|$zm#g(q$<+99)x0V~wtiym-l~)X2zQfNuEjOT6 zhXH#OR)4rOMx4p!LB7PMU9gT=`@1~zz((=Af=(=p3N%Ggg%>-NUv8-Z9XfZz{LX|P z;H#gRDx?p-w9tTEIyYn*d{(v+l{FmLiFcHEex_{(%+zT>iO)2@)EHt{p}*x?HWQw|_X`QOFDx*iCCtpY79O7d;ewqw=O2Eqj?oyF(w>RlQ)j{4 ze`=Tp4B}U6#0}Bs2F4jfR-pHdmblAw@??sQ;3sFC8g)w;jL#S~eT7$%A)8$1b zb}e%huU^-nvUB)M$^-+NOzz)z2Nhj}-%pva=WF!&VLrXQudu-dsO-50%=wFLnB}mO zGoKVSxpSn0db}#^53?<&_?k2p?}Ikp?1>Kt()Dzi9VUcSO9E9?G> z65%e0@c!A47>z=CkA#>^w##wCEq@wu5?-MR={|S3*wr{3mA5%oJf55LP{B%fWq%@$ z2N^sTBrD7&R8}?`jOU@h7b>{=wAOA6a1@qE%6Qrp>tEX6x&A`d70LQ8=O zxi0dCWXSHWG*Z}|3DbaI6pDWz@2nBrnXph%nhVQ8%_T+UOxU2{3AY8Lq-;ME_WMX9 zsUQXY8;~k_I=_z83vYVboHU_jjV6q7d1Q$_(RUCj7K{mb{4}N0>bS|MwDAOv8S`@NhBC5}IA=GbMy_DGeZ(S)Vf^+AsK0~w_k2jkoP2U*#=3l$*aXVv~`mOypk`Gm%nfCt9 zjaG)sJ?v-qW?t>Tf9gx=rnOVw-&hT|iTTHM7gVDgblD}+I1EaFKA3ysHd}wZ-Rj4iUc0_HmY2j|AM>+kT{jafsBVAa YJt=&=XMsdyU;{|Z)78&qol`;+0O>@ni2wiq diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_time.png b/app/src/main/res/drawable-xxhdpi/ic_action_time.png new file mode 100644 index 0000000000000000000000000000000000000000..186b1a01bff1a422714e202e050cbd5eb6c7fde3 GIT binary patch literal 1291 zcmV+m1@!ufP)!p4n$+pKrl>(|u;v+B5UbH{YI=6as-jAP@)y0)apv5C{YU zfj}S-2n35UH8qtEE(c4&o#1}37CZ>nfaTyCFhXkS5qvJV9c%%gfZxDL3H}BL!MorQ zFb_;6Mdd`F4OWBQ;JBpVBK`qif%RYxsXV>#^SD4CHHkhGC%`svEvf!r_zdtA_{FgB z(~XJ_aAh)!Uk1JjSom1}0?)A*A=#ptM*bE~TEb`G>SPc<8+>Sy@X`Fv0)Q}!pAQcC z5Qv4BuX%*TLemRi9e5UO23x_W;8&k(LtW^?Ru*-DqY8qIf!Dz*aDj&@t_VB>J_r9Q z{BBcdOh89gDTvSJ%VMMUM zJM4Ol|JcLa%jWSp0ko?E9PzMmTkom?Es~x53~mm%ZCPNCWc%3eJj*rlw@424VYWsj zsExD0o02AUIkPCUbg<;SKdh1*!~ZPg+0Iy&DlXDjB~94niUCa$o%zJl#6G5v>7H4k z_`EdmjzpW^ftfBuJwGKDwhcb#Z*2xdrNMh8OsEUP!dtIl0o7^%e{P<{q0gwbCvI$~ z%JV7lI?(4g^JvNd{_GPHFVIn24LB~bu_@6MLYgvwMMf_K{dj3zM8u;B(HweTV+?P^ z0RH?P5~HBVHUm~j#Qi0X7{H>UenDTFZ8JbLclPTVwx$h`oK6R9GoV}0;M1DZ2&N5K z%){k)>)8@p#7~n*Hy5~M0RJ7)$z8QA1}qaa^n-y!S`Y>_2>R7%ivi`LM3$olY!dXV z(-s42gFIOZ(10A#shuqbh=%F`M-505OLXojeG6;n`DWAYUXt7M8}H!8FzLtsLmUlXibgz}!%O#K8_M<##R+OtMwAJ%;=5Uv!W&<}OU8ea{o0tiE zWd(D(FpGC!9pApQeZsyJhv0l^VpK<}bXGwG7)-cdoa-V&Ri5sk_~H9N!y)m*`H7P1 zn;7u#h5I8tg*UN{K2uHH0(c{;!-MppcCZWJr8tQ@x~jmi0re6hu#L|(a4X9>dB_9N zWgP;MjwuK;!E21V_{V?^bX|>__?4F3mX#bAHpL{!F4C1{i8rE5;^2cW?K5mbI={AZ zjIOOrtPv3&wTu`Ro-S^c7!fR;eNST*9$j6mXhtSC<1+Y&AC}03u5@{~!O^jlpSrPh z#UAhwU0+Wi5C{YUfj}S-2m}IwKp+qZ1OmY(`~&UeHY`|znOy(?002ovPDHLkV1i#f BN$&sv literal 0 HcmV?d00001 diff --git a/app/src/main/res/menu/menu_introduction.xml b/app/src/main/res/menu/menu_introduction.xml index 007941c..25e5e12 100644 --- a/app/src/main/res/menu/menu_introduction.xml +++ b/app/src/main/res/menu/menu_introduction.xml @@ -2,8 +2,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" tools:context="com.kauron.dungeonmanager.Introduction"> - 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