1
0
Fork 0

Added attack and defense class-based computation

This commit is contained in:
Carlos Galindo 2015-02-21 18:49:45 +01:00
commit 84b93fe74d
7 changed files with 269 additions and 96 deletions

View file

@ -97,78 +97,177 @@
android:id="@+id/curativeEffortsText"/>
</LinearLayout>
<GridLayout
android:layout_width="fill_parent"
<LinearLayout
android:id="@+id/attackContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/curativeEffortsContainer"
android:id="@+id/thirdLayout"
android:columnCount="3">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="0"
android:layout_column="0"
android:id="@+id/FUE"
android:hint="@string/FUE" />
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:id="@+id/titleAttack"
android:text="@string/attack"
android:textAllCaps="true"
android:layout_marginBottom="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="1"
android:layout_column="0"
android:id="@+id/CON"
android:hint="@string/CON" />
android:textStyle="bold"
android:textColor="?android:textColorSecondary"
android:textSize="14sp"
android:gravity="center_vertical"
android:paddingLeft="8dip"
android:paddingRight="8dip"/>
<GridLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/attackGrid"
android:columnCount="3"
android:rowCount="2">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="0"
android:layout_column="0"
android:id="@+id/FUE"
android:hint="@string/FUE" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="1"
android:layout_column="0"
android:id="@+id/CON"
android:hint="@string/CON" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="0"
android:layout_column="1"
android:id="@+id/DES"
android:hint="@string/DES" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="1"
android:layout_column="1"
android:id="@+id/INT"
android:hint="@string/INT" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="0"
android:layout_column="2"
android:id="@+id/SAB"
android:hint="@string/SAB" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="1"
android:layout_column="2"
android:id="@+id/CAR"
android:hint="@string/CAR" />
</GridLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/defenseContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/attackContainer"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:id="@+id/titleDefense"
android:text="@string/defense"
android:textAllCaps="true"
android:layout_marginBottom="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="0"
android:layout_column="1"
android:id="@+id/DES"
android:hint="@string/DES" />
android:textStyle="bold"
android:textColor="?android:textColorSecondary"
android:textSize="14sp"
android:gravity="center_vertical"
android:paddingLeft="8dip"
android:paddingRight="8dip"/>
<TextView
android:layout_width="wrap_content"
<GridLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="1"
android:layout_column="1"
android:id="@+id/INT"
android:hint="@string/INT" />
android:id="@+id/defenseGrid"
android:columnCount="2"
android:rowCount="2">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="0"
android:layout_column="2"
android:id="@+id/SAB"
android:hint="@string/SAB" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="0"
android:layout_column="0"
android:id="@+id/CA"
android:hint="@string/CA" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="1"
android:layout_column="2"
android:id="@+id/CAR"
android:hint="@string/CAR" />
</GridLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="0"
android:layout_column="1"
android:id="@+id/FORT"
android:hint="@string/FORT" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="1"
android:layout_column="0"
android:id="@+id/REF"
android:hint="@string/REF" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="1"
android:layout_column="1"
android:id="@+id/VOL"
android:hint="@string/VOL" />
</GridLayout>
</LinearLayout>
</RelativeLayout>

View file

@ -13,7 +13,7 @@
<string name="missing_info_error">Tienes que rellenar todos los campos</string>
<string name="new_energies1">Te quedan</string>
<string name="new_energies2">esfuerzos curativos.</string>
<string name="new_energies_title">¿Usar un esfuerzo curativo?</string>
<string name="new_energies">Nuevas energías</string>
<string name="no">No</string>
<string name="no_curative_efforts_error">No te quedan esfuerzos curativos</string>
<string name="ok">Ok</string>
@ -31,7 +31,7 @@
<string name="curative_efforts">Esfuerzos curativos</string>
<string name="pg">PG</string>
<string name="action_reset">Borrar datos</string>
<string name="curative_display_text1">Tienes</string>
<string name="curative_display_text1">Te quedan</string>
<string name="curative_display_text2">de</string>
<string name="curative_display_text3">esfuerzos curativos diarios</string>
<string name="die">Morir</string>
@ -40,9 +40,20 @@
<string name="reset_confirmation">Todos los datos se perderán irrevocablemente</string>
<string name="reset_confirmation_title">¿Estás seguro?</string>
<string name="CAR">CAR</string>
<string name="CON" translatable="false">CON</string>
<string name="DES" translatable="false">DES</string>
<string name="FUE" translatable="false">FUE</string>
<string name="INT" translatable="false">INT</string>
<string name="SAB" translatable="false">SAB</string>
<string name="CON">CON</string>
<string name="DES">DES</string>
<string name="FUE">FUE</string>
<string name="INT">INT</string>
<string name="SAB">SAB</string>
<string name="state_changed_debilitado">Te has caído al suelo debilitado, no puedes moverte ni hacer nada.</string>
<string name="state_changed_malherido">¡Sólo tienes la mitad de la vida!</string>
<string name="new_energies_message">¿Quién va a usar un esfuerzo curativo?</string>
<string name="me">Yo</string>
<string name="other">Otro</string>
<string name="attack">Ataque</string>
<string name="defense">Defensa</string>
<string name="CA">CA</string>
<string name="FORT">FORT</string>
<string name="REF">REF</string>
<string name="VOL">VOL</string>
</resources>

View file

@ -2,10 +2,16 @@
<resources>
<string name="app_name" translatable="false">DungeonManager</string>
<string name="attack">Attack</string>
<string name="action_cure">Cure</string>
<string name="action_undo">Undo</string>
<string name="pg">PG</string>
<string name="die">Die</string>
<string name="CA">CA</string>
<string name="FORT">FORT</string>
<string name="REF">REF</string>
<string name="VOL">VOL</string>
<string name="defense">Defense</string>
<string name="curative_efforts">Curative efforts</string>
<string name="curative_display_text1">You have</string>
<string name="curative_display_text2">out of</string>
@ -20,9 +26,11 @@
<string name="action_undo_current_pg">Action undone</string>
<string name="action_edit_basics">Edit character</string>
<string name="adventurer_name">Adventurer name</string>
<string name="state_changed_malherido">You have less than half of your maximum health</string>
<string name="new_energies_message">Who is using a curative effort?</string>
<string name="class_name">Class</string>
<string name="race_name">Race</string>
<string name="state_changed_debilitado">You have fainted. You can\'t move or do anything!</string>
<string name="cancel">Cancel</string>
<string name="ok">Ok</string>
<string name="yes">Yes</string>
@ -32,7 +40,7 @@
<string name="message_death">Your character has died</string>
<string name="new_energies1">You have</string>
<string name="new_energies2">curative efforts</string>
<string name="new_energies_title">Use a curative effort?</string>
<string name="new_energies">New energies</string>
<string name="title_activity_introduction">Edit character</string>
<string name="action_finish">Done</string>
@ -44,6 +52,8 @@
<string name="maxed_curative">You have reached your maximum level of PG</string>
<string name="suffer_damage">Input the damage suffered</string>
<string name="suffer_damage_hint">PG lost</string>
<string name="me">Me</string>
<string name="other">Otro</string>
<string name="FUE">FUE</string>
<string name="CON">CON</string>