Add support for magical melee attack (UI) & update icon cache.
|
|
@ -6,7 +6,6 @@ import com.pixelized.rplexicon.data.model.CharacterSheet
|
|||
import com.pixelized.rplexicon.data.model.Property
|
||||
import com.pixelized.rplexicon.data.model.alteration.Alteration
|
||||
import com.pixelized.rplexicon.ui.screens.character.composable.actions.AttackUio
|
||||
import com.pixelized.rplexicon.utilitary.extentions.string.attackIcon
|
||||
import com.pixelized.rplexicon.utilitary.extentions.icon
|
||||
import com.pixelized.rplexicon.utilitary.extentions.modifier
|
||||
import com.pixelized.rplexicon.utilitary.extentions.toLabel
|
||||
|
|
@ -30,6 +29,10 @@ class AttackUioFactory @Inject constructor() {
|
|||
Property.PROFICIENCY -> characterSheet.proficiency
|
||||
Property.STRENGTH -> characterSheet.strength.modifier
|
||||
Property.DEXTERITY -> characterSheet.dexterity.modifier
|
||||
Property.CONSTITUTION -> characterSheet.constitution.modifier
|
||||
Property.INTELLIGENCE -> characterSheet.intelligence.modifier
|
||||
Property.WISDOM -> characterSheet.wisdom.modifier
|
||||
Property.CHARISMA -> characterSheet.charisma.modifier
|
||||
else -> 0
|
||||
}
|
||||
} + hitAlteration + (diceThrow.flat?.value ?: 0)
|
||||
|
|
@ -57,6 +60,10 @@ class AttackUioFactory @Inject constructor() {
|
|||
Property.PROFICIENCY -> characterSheet.proficiency
|
||||
Property.STRENGTH -> characterSheet.strength.modifier
|
||||
Property.DEXTERITY -> characterSheet.dexterity.modifier
|
||||
Property.CONSTITUTION -> characterSheet.constitution.modifier
|
||||
Property.INTELLIGENCE -> characterSheet.intelligence.modifier
|
||||
Property.WISDOM -> characterSheet.wisdom.modifier
|
||||
Property.CHARISMA -> characterSheet.charisma.modifier
|
||||
else -> 0
|
||||
}
|
||||
} + damageAlteration + (diceThrow.flat?.value ?: 0)
|
||||
|
|
|
|||
|
|
@ -80,6 +80,11 @@ private object ResourcesCache {
|
|||
"Abri (partiel)" to R.drawable.icbg_patient_defence,
|
||||
"Abri (important)" to R.drawable.icbg_multiattack_defense,
|
||||
"Abri (total)" to R.drawable.icbg_protection_from_missiles,
|
||||
"Arme spirituelle" to R.drawable.icbg_spiritual_weapon_maul,
|
||||
"Epée courte" to R.drawable.icbg_shortsword_unfaded,
|
||||
"Rapière" to R.drawable.icbg_rapier_unfaded,
|
||||
"Arbalète légère" to R.drawable.icbg_light_crossbow_unfaded,
|
||||
"Arbalète de poing" to R.drawable.icbg_hand_crossbow_unfaded,
|
||||
)
|
||||
|
||||
val attacks = hashMapOf(
|
||||
|
|
@ -109,15 +114,23 @@ private object ResourcesCache {
|
|||
"Arbalète légère" to R.drawable.icbg_ranged_attack,
|
||||
"Arbalète de poing" to R.drawable.icbg_ranged_attack,
|
||||
"Arbalète de poing (main gauche)" to R.drawable.icbg_off_hand_attack_ranged,
|
||||
"Arme spirituelle (invocation)" to R.drawable.icbg_spiritual_weapon_maul,
|
||||
"Arme spirituelle" to R.drawable.icbg_spiritual_weapon_maul,
|
||||
"Dague en argent" to R.drawable.icbg_main_hand_attack,
|
||||
"Épée courte" to R.drawable.icbg_main_hand_attack,
|
||||
)
|
||||
|
||||
val objects = hashMapOf(
|
||||
"Parchemin de Bénédiction" to R.drawable.icbg_scroll_of_bless_unfaded,
|
||||
"Parchemin d'Arme spirituelle" to R.drawable.icbg_book_signedtradebisa_unfaded,
|
||||
"Potion de guérison" to R.drawable.icbg_pot_potion_of_healing_unfaded,
|
||||
"Potion de soin (Supérieur)" to R.drawable.icbg_potion_of_superior_healing_unfaded,
|
||||
"Eau bénite" to R.drawable.icbg_grn_holy_water_unfaded,
|
||||
"Baies nourricières" to R.drawable.icbg_food_goodberry_unfaded,
|
||||
"Lanterne de révélation" to R.drawable.icbg_moonlantern_unfaded,
|
||||
"Dent de loup d'hiver" to R.drawable.icbg_worg_fang_unfaded,
|
||||
"Lanterne de révélation" to R.drawable.icbg_lantern_of_revealing,
|
||||
"Poussière de disparition" to R.drawable.icbg_haste_spore_grenade_unfaded,
|
||||
)
|
||||
|
||||
val equipments = hashMapOf(
|
||||
|
|
@ -191,6 +204,8 @@ private object ResourcesCache {
|
|||
"Ascendance féerique" to R.drawable.icbg_draconic_ancestry_copper_acid,
|
||||
"Source d'inspiration" to R.drawable.icbg_bardic_defence,
|
||||
"Touche à tout" to R.drawable.icbg_jack_of_all_trades,
|
||||
"Style de combat : Technique supérieur" to R.drawable.icbg_wild_magic_teleport_activate_barbarian,
|
||||
"Style de combat : Défense" to R.drawable.icbg_heavily_armoured,
|
||||
)
|
||||
|
||||
val spells = hashMapOf(
|
||||
|
|
|
|||
BIN
app/src/main/res/drawable/icbg_hand_crossbow_unfaded.png
Normal file
|
After Width: | Height: | Size: 37 KiB |
BIN
app/src/main/res/drawable/icbg_haste_spore_grenade_unfaded.png
Normal file
|
After Width: | Height: | Size: 35 KiB |
BIN
app/src/main/res/drawable/icbg_lantern_of_revealing.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
BIN
app/src/main/res/drawable/icbg_light_crossbow_unfaded.png
Normal file
|
After Width: | Height: | Size: 42 KiB |
|
After Width: | Height: | Size: 30 KiB |
BIN
app/src/main/res/drawable/icbg_rapier_unfaded.png
Normal file
|
After Width: | Height: | Size: 35 KiB |
BIN
app/src/main/res/drawable/icbg_shortsword_unfaded.png
Normal file
|
After Width: | Height: | Size: 37 KiB |
BIN
app/src/main/res/drawable/icbg_worg_fang_unfaded.png
Normal file
|
After Width: | Height: | Size: 31 KiB |
|
|
@ -104,7 +104,7 @@
|
|||
<string name="character_sheet_tab_proficiency">Talents</string>
|
||||
<string name="character_sheet_tab_inventory">Inventaire</string>
|
||||
<string name="character_sheet_tab_alteration">Altérations</string>
|
||||
<string name="character_sheet_tab_actions">Capacités</string>
|
||||
<string name="character_sheet_tab_actions">Actions</string>
|
||||
<string name="character_sheet_title">Feuille de personnage</string>
|
||||
<string name="character_sheet_title_hp">Point de vie</string>
|
||||
<string name="character_sheet_title_ca">CA</string>
|
||||
|
|
|
|||