Skip to content

Commit d49ff02

Browse files
fmasafmasa
committed
Merge branch 'fix/more-skill-types' into 'master'
Added WS, BS and Initiative as characteristics that can be used for skills Closes #54 See merge request fmasa/wfrp-master!100
2 parents 2053abb + 9e754f7 commit d49ff02

File tree

10 files changed

+98
-50
lines changed

10 files changed

+98
-50
lines changed

‎app/src/main/java/cz/muni/fi/rpg/model/domain/skills/SkillCharacteristic.kt‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,29 @@ import cz.muni.fi.rpg.R
55

66
enum class SkillCharacteristic {
77
AGILITY,
8+
BALLISTIC_SKILL,
89
DEXTERITY,
10+
INITIATIVE,
911
INTELLIGENCE,
1012
FELLOWSHIP,
1113
STRENGTH,
1214
TOUGHNESS,
15+
WEAPON_SKILL,
1316
WILL_POWER;
1417

1518
@StringRes
16-
fun getReadableNameId(): Int {
19+
fun getShortcutNameId(): Int {
1720
return when (this) {
18-
AGILITY -> R.string.label_agility
19-
DEXTERITY -> R.string.label_dexterity
20-
INTELLIGENCE -> R.string.label_intelligence
21-
FELLOWSHIP -> R.string.label_fellowship
22-
STRENGTH -> R.string.label_strength
23-
TOUGHNESS -> R.string.label_toughness
24-
WILL_POWER -> R.string.label_will_power
21+
AGILITY -> R.string.label_shortcut_agility
22+
BALLISTIC_SKILL -> R.string.label_shortcut_ballistic_skill
23+
DEXTERITY -> R.string.label_shortcut_dexterity
24+
INITIATIVE -> R.string.label_shortcut_initiative
25+
INTELLIGENCE -> R.string.label_shortcut_intelligence
26+
FELLOWSHIP -> R.string.label_shortcut_fellowship
27+
STRENGTH -> R.string.label_shortcut_strength
28+
TOUGHNESS -> R.string.label_shortcut_toughness
29+
WEAPON_SKILL -> R.string.label_shortcut_weapon_skill
30+
WILL_POWER -> R.string.label_shortcut_will_power
2531
}
2632
}
2733
}

‎app/src/main/java/cz/muni/fi/rpg/ui/character/skills/SkillDialog.kt‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package cz.muni.fi.rpg.ui.character.skills
22

33
import android.app.Dialog
4-
import android.content.Context
54
import android.os.Bundle
65
import android.view.View
7-
import android.view.inputmethod.InputMethodManager
8-
import android.widget.ArrayAdapter
96
import androidx.appcompat.app.AlertDialog
107
import androidx.core.os.bundleOf
8+
import androidx.core.view.children
119
import androidx.fragment.app.DialogFragment
10+
import com.google.android.material.chip.Chip
1211
import cz.muni.fi.rpg.R
1312
import cz.muni.fi.rpg.model.domain.character.CharacterId
1413
import cz.muni.fi.rpg.model.domain.skills.Skill
@@ -51,20 +50,7 @@ class SkillDialog : DialogFragment(), CoroutineScope by CoroutineScope(Dispatche
5150

5251
val view = inflater.inflate(R.layout.dialog_skill, null)
5352

54-
val characteristicSpinner = view.skillCharacteristic
55-
val characteristics = SkillCharacteristic.values()
56-
.map { getString(it.getReadableNameId()) }
57-
.sorted()
58-
59-
characteristicSpinner.setAdapter(
60-
ArrayAdapter(requireContext(), R.layout.dropdown_menu_popup_item, characteristics)
61-
)
62-
characteristicSpinner.setText(characteristics[0], false)
63-
characteristicSpinner.setOnClickListener {
64-
(requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager)
65-
.hideSoftInputFromWindow(it.windowToken, 0)
66-
}
67-
53+
addCharacteristicChips(view)
6854
setDefaults(view)
6955

7056
val form = Form(requireContext()).apply {
@@ -108,7 +94,7 @@ class SkillDialog : DialogFragment(), CoroutineScope by CoroutineScope(Dispatche
10894

10995
view.nameInput.setDefaultValue(skill.name)
11096
view.descriptionInput.setDefaultValue(skill.description)
111-
view.skillCharacteristic.setText(getString(skill.characteristic.getReadableNameId()), false)
97+
view.skillCharacteristic.findViewWithTag<Chip>(skill.characteristic).isChecked = true
11298
view.skillAdvanced.isChecked = skill.advanced
11399
view.advancesInput.setDefaultValue(skill.advances.toString())
114100
}
@@ -139,15 +125,23 @@ class SkillDialog : DialogFragment(), CoroutineScope by CoroutineScope(Dispatche
139125
}
140126
}
141127

142-
private fun selectedCharacteristic(view: View): SkillCharacteristic {
143-
val menuValue = view.skillCharacteristic.text.toString()
128+
private fun addCharacteristicChips(view: View) {
129+
SkillCharacteristic.values().forEach {
130+
val chip = layoutInflater.inflate(R.layout.item_chip_choice, null, false) as Chip
144131

145-
for (item in SkillCharacteristic.values()) {
146-
if (getString(item.getReadableNameId()) == menuValue) {
147-
return item
148-
}
132+
chip.setText(it.getShortcutNameId())
133+
chip.tag = it
134+
view.skillCharacteristic.addView(chip)
149135
}
150136

151-
error("User somehow managed to select something he was not supposed to")
137+
view.skillCharacteristic
138+
.findViewWithTag<Chip>(SkillCharacteristic.values().first())
139+
.isChecked = true
140+
}
141+
142+
private fun selectedCharacteristic(view: View): SkillCharacteristic {
143+
return view.skillCharacteristic.children
144+
.first { it is Chip && it.isChecked }
145+
.tag as SkillCharacteristic
152146
}
153147
}

‎app/src/main/java/cz/muni/fi/rpg/ui/character/skills/adapter/SkillHolder.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,14 @@ class SkillHolder(
3737
view.skillIcon.setImageResource(
3838
when (skill.characteristic) {
3939
SkillCharacteristic.AGILITY -> R.drawable.ic_agility
40+
SkillCharacteristic.BALLISTIC_SKILL -> R.drawable.ic_ballistic_skill
4041
SkillCharacteristic.DEXTERITY -> R.drawable.ic_dexterity
42+
SkillCharacteristic.INITIATIVE -> R.drawable.ic_initiative
4143
SkillCharacteristic.INTELLIGENCE -> R.drawable.ic_intelligence
4244
SkillCharacteristic.FELLOWSHIP -> R.drawable.ic_fellowship
4345
SkillCharacteristic.STRENGTH -> R.drawable.ic_strength
4446
SkillCharacteristic.TOUGHNESS -> R.drawable.ic_toughness
47+
SkillCharacteristic.WEAPON_SKILL -> R.drawable.ic_weapon_skill
4548
SkillCharacteristic.WILL_POWER -> R.drawable.ic_will_power
4649
}
4750
)
@@ -63,11 +66,14 @@ class SkillHolder(
6366
private fun calculateBaseLevel(characteristic: SkillCharacteristic, stats: Stats): Int {
6467
return when (characteristic) {
6568
SkillCharacteristic.AGILITY -> stats.agility
69+
SkillCharacteristic.BALLISTIC_SKILL -> stats.ballisticSkill
6670
SkillCharacteristic.DEXTERITY -> stats.dexterity
6771
SkillCharacteristic.FELLOWSHIP -> stats.fellowship
72+
SkillCharacteristic.INITIATIVE -> stats.initiative
6873
SkillCharacteristic.INTELLIGENCE -> stats.intelligence
6974
SkillCharacteristic.STRENGTH -> stats.strength
7075
SkillCharacteristic.TOUGHNESS -> stats.toughness
76+
SkillCharacteristic.WEAPON_SKILL -> stats.weaponSkill
7177
SkillCharacteristic.WILL_POWER -> stats.willPower
7278
}
7379
}

‎app/src/main/res/drawable/ic_ballistic_skill.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:height="58dp"
3+
android:viewportHeight="252.00058"
4+
android:viewportWidth="276.29642"
5+
android:width="64dp">
6+
<path
7+
android:fillColor="#000000"
8+
android:pathData="m171.232,127.17a9.044,9.044 0,0 1,-7.707 10.216l-88.349,12.366 -12.798,19.513 -49.582,6.942 12.798,-19.541 -14.728,2.064c-0.167,0 -0.333,0.072 -0.506,0.099a9.131,9.131 0,0 1,-1.265 0.086,9.044 9.044,135 0,1 -1.244,-18.01c0.174,0 0.34,0 0.513,-0.047l14.728,-2.063 -17.67,-15.307 49.549,-6.928 17.67,15.306 88.356,-12.365a9.118,9.118 0,0 1,1.264 -0.087,9.051 9.051,0 0,1 8.972,7.754zM149.21,104.042a19.44,19.44 0,0 1,6.508 -6.196,14.056 14.056,0 0,1 8.053,-1.824 16.725,16.725 0,0 1,8.125 3.028,26.734 26.734,0 0,1 7.154,7.554 39.805,39.805 0,0 1,5.032 11.48,46.488 46.488,0 0,1 1.537,13.197 40.737,40.737 0,0 1,-2.096 11.98,27.679 27.679,0 0,1 -5.124,9.211 16.898,16.898 0,0 1,-7.441 5.131,14.029 14.029,0 0,1 -8.259,0.153 19.207,19.207 0,0 1,-7.507 -4.273,27.287 27.287,0 0,1 -3.44,-3.72l-19.367,2.708a78.692,78.692 0,0 0,4.26 9.584,62.74 62.74,135 0,0 11.194,15.307 41.41,41.41 0,0 0,14.336 9.484,29.024 29.024,0 0,0 16.558,1.332 32.058,32.058 0,0 0,15.786 -8.926c4.739,-4.712 8.652,-10.955 11.467,-18.308a79.198,79.198 0,0 0,4.992 -25.197,91.956 91.956,0 0,0 -3.288,-28.152 77.255,77.255 45,0 0,-11.094 -23.959c-4.56,-6.436 -9.85,-11.368 -15.468,-14.642a31.799,31.799 45,0 0,-16.777 -4.572,29.144 29.144,45 0,0 -15.767,5.231 41.928,41.928 45,0 0,-12.099 13.138,64.503 64.503,0 0,0 -7.194,17.71 82.286,82.286 45,0 0,-2.13 12.898l18.715,-2.622a29.503,29.503 0,0 1,3.334 -6.736zM268.193,83.052C261.637,61.887 251.821,44.198 240.088,30.627 228.954,17.717 216.361,8.871 203.417,4.1c-12.093,-4.446 -24.338,-5.244 -35.972,-2.549 -10.835,2.522 -21.118,8.08 -30.362,16.572 -8.652,7.926 -15.654,17.776 -21.111,28.684a139.934,139.934 135,0 0,-11.574 33.942,171.614 171.614,0 0,0 -3.514,36.404l13.549,-1.896a125.486,125.486 135,0 1,3.028 -24.206,99.756 99.756,45 0,1 9.583,-25.756c4.419,-8.04 10.03,-15.074 16.798,-20.452 7.134,-5.664 14.928,-8.992 22.98,-9.984 8.499,-1.064 17.264,0.446 25.763,4.506 8.918,4.26 17.45,11.268 24.891,20.864 7.714,9.943 14.109,22.476 18.396,37.15a135.309,135.309 45,0 1,5.244 44.79c-0.752,14.43 -3.84,27.853 -8.832,39.394 -4.825,11.148 -11.314,20.332 -19.094,26.928 -7.388,6.282 -15.807,10.149 -24.878,11.194a45.736,45.736 0,0 1,-24.698 -4.26c-7.388,-3.433 -14.296,-8.691 -20.418,-15.306a97.327,97.327 0,0 1,-15.434 -22.582,122.75 122.75,0 0,1 -8.725,-23.147l-13.49,1.864a168.579,168.579 135,0 0,11.98 34.694,136.92 136.92,135 0,0 19.301,30.055c7.794,9.112 16.692,16.698 26.348,22.076 10.308,5.744 21.616,9.038 33.423,8.919 12.758,-0.126 24.864,-4.213 35.712,-11.867 11.614,-8.192 21.603,-20.338 29.17,-35.659 7.946,-16.092 13.018,-35.273 14.429,-56.184A180.445,180.445 0,0 0,268.197 83.031Z" />
9+
</vector>

‎app/src/main/res/drawable/ic_dexterity.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<vector android:height="64dp" android:viewportHeight="512"
2-
android:viewportWidth="512" android:width="64dp" xmlns:android="http://schemas.android.com/apk/res/android">
3-
<path android:fillColor="#000000" android:pathData="M289.08,257.17a9.044,9.044 0,0 1,-7.707 10.216l-88.349,12.366 -12.798,19.513 -49.582,6.942 12.798,-19.541 -14.728,2.064c-0.167,0 -0.333,0.072 -0.506,0.099a9.131,9.131 0,0 1,-1.265 0.086,9.044 9.044,135 0,1 -1.244,-18.01c0.174,0 0.34,0 0.513,-0.047l14.728,-2.063 -17.67,-15.307 49.549,-6.928 17.67,15.306 88.356,-12.365a9.118,9.118 0,0 1,1.264 -0.087,9.051 9.051,0 0,1 8.972,7.754zM267.057,234.042a19.44,19.44 45,0 1,6.508 -6.196,14.056 14.056,0 0,1 8.053,-1.824 16.725,16.725 0,0 1,8.125 3.028,26.734 26.734,135 0,1 7.154,7.554 39.805,39.805 0,0 1,5.032 11.48,46.488 46.488,0 0,1 1.537,13.197 40.737,40.737 0,0 1,-2.096 11.98,27.679 27.679,0 0,1 -5.124,9.211 16.898,16.898 0,0 1,-7.441 5.131,14.029 14.029,0 0,1 -8.259,0.153 19.207,19.207 0,0 1,-7.507 -4.273,27.287 27.287,0 0,1 -3.44,-3.72l-19.367,2.708a78.692,78.692 0,0 0,4.26 9.584,62.74 62.74,0 0,0 11.194,15.307 41.41,41.41 0,0 0,14.336 9.484,29.024 29.024,0 0,0 16.558,1.332 32.058,32.058 0,0 0,15.786 -8.926c4.739,-4.712 8.652,-10.955 11.467,-18.308a79.198,79.198 135,0 0,4.992 -25.197,91.956 91.956,135 0,0 -3.288,-28.152 77.255,77.255 45,0 0,-11.094 -23.959c-4.56,-6.436 -9.85,-11.368 -15.468,-14.642a31.799,31.799 0,0 0,-16.777 -4.572,29.144 29.144,0 0,0 -15.767,5.231 41.928,41.928 45,0 0,-12.099 13.138,64.503 64.503,0 0,0 -7.194,17.71A82.286,82.286 0,0 0,245.008 243.4l18.715,-2.622a29.503,29.503 0,0 1,3.334 -6.736zM386.04,213.052c-6.556,-21.164 -16.372,-38.854 -28.105,-52.424 -11.134,-12.911 -23.726,-21.756 -36.671,-26.528 -12.093,-4.446 -24.338,-5.244 -35.972,-2.549 -10.835,2.522 -21.118,8.08 -30.362,16.572 -8.652,7.926 -15.654,17.776 -21.111,28.684a139.934,139.934 45,0 0,-11.574 33.942,171.614 171.614,135 0,0 -3.514,36.404l13.549,-1.896a125.486,125.486 135,0 1,3.028 -24.206,99.756 99.756,45 0,1 9.583,-25.756c4.419,-8.04 10.03,-15.074 16.798,-20.452 7.134,-5.664 14.928,-8.992 22.98,-9.984 8.499,-1.064 17.264,0.446 25.763,4.506 8.918,4.26 17.45,11.268 24.891,20.864 7.714,9.943 14.109,22.476 18.396,37.15a135.309,135.309 45,0 1,5.244 44.79c-0.752,14.43 -3.84,27.853 -8.832,39.394 -4.825,11.148 -11.314,20.332 -19.094,26.928 -7.388,6.282 -15.807,10.149 -24.878,11.194a45.736,45.736 0,0 1,-24.698 -4.26c-7.388,-3.433 -14.296,-8.691 -20.418,-15.306a97.327,97.327 0,0 1,-15.434 -22.582,122.75 122.75,0 0,1 -8.725,-23.147l-13.49,1.864a168.579,168.579 45,0 0,11.98 34.694,136.92 136.92,135 0,0 19.301,30.055c7.794,9.112 16.692,16.698 26.348,22.076 10.308,5.744 21.616,9.038 33.423,8.919 12.758,-0.126 24.864,-4.213 35.712,-11.867 11.614,-8.192 21.603,-20.338 29.17,-35.659 7.946,-16.092 13.018,-35.273 14.429,-56.184a180.445,180.445 45,0 0,-7.714 -65.256z"/>
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="64dp"
3+
android:height="64dp"
4+
android:viewportWidth="278.1847"
5+
android:viewportHeight="262.51544">
6+
<path
7+
android:pathData="m179.002,0c-1.082,0.001 -2.125,0.14 -3.184,0.226l-31.051,51.252c36.83,3.193 55.067,20.103 61.686,36.756l-10.036,3.988c-4.624,-11.634 -16.176,-24.494 -43.39,-28.904 11.497,8.228 20.125,17.747 24.557,29.34l-10.088,3.856c-4.718,-12.343 -16.278,-22.859 -33.441,-32.304 -6.037,2.472 -36.966,15.104 -47.673,18.73 -22.287,7.547 -34.426,22.855 -57.589,49.74l-0.079,0.09 -0.081,0.087c-3.757,3.991 -5.336,7.592 -5.699,10.218 -0.362,2.625 0.29,4.258 1.445,5.478 2.309,2.44 8.507,3.984 17.682,-2.239l0.045,-0.031 45.025,-29.263 6.512,8.581 -30.873,27.186 -56.459,52.177c-7.157,6.614 -7.042,13.045 -5.37,15.265 0.836,1.11 2.099,1.962 5.15,1.825 3.05,-0.137 7.768,-1.617 13.669,-5.659 17.84,-12.219 34.461,-24.43 49.05,-39.157l-0.032,-0.134 0.22,-0.055c0.103,-0.104 0.208,-0.205 0.311,-0.309l0.21,0.176a64.593,64.593 0,0 0,6.05 -1.913c3.608,-1.348 7.465,-3.805 7.923,-4.426 0.194,-0.264 1.304,-4.016 1.494,-7.292 0.19,-3.277 0.004,-6.062 0.004,-6.062l10.774,-0.739c0,0 0.238,3.384 0.005,7.425 -0.234,4.04 -0.393,8.752 -3.586,13.08 -3.456,4.686 -8.51,6.518 -12.835,8.133a70.163,70.163 0,0 1,-3.796 1.286c-14.623,19.61 -33.2,34.546 -50.376,50.105 -5.942,5.383 -8.402,10.013 -8.949,12.859 -0.548,2.846 0.08,3.844 1.552,4.908 2.941,2.128 12.698,2.471 22.799,-6.834 19.808,-18.25 39.133,-36.38 53.903,-58.032l0.487,0.29c0.866,-0.374 2.525,-1.113 4.778,-2.342 2.982,-1.628 6.218,-4.211 6.65,-4.864 0.411,-0.62 1.52,-4.548 1.853,-7.88 0.333,-3.331 0.307,-6.123 0.307,-6.123l10.799,-0.116c0,0 0.038,3.326 -0.36,7.314 -0.399,3.988 -0.82,8.582 -3.598,12.773 -2.8,4.223 -6.916,6.432 -10.478,8.375 -1.086,0.593 -2.086,1.096 -3.014,1.547 -9.884,17.947 -24.092,33.498 -39.222,49.773 -3.234,3.479 -3.829,6.122 -3.637,7.987 0.192,1.865 1.225,3.461 3.253,4.72 4.056,2.52 11.781,2.918 18.86,-4.387 8.164,-8.425 15.558,-17.232 21.998,-26.578 5.579,-10.177 11.25,-20.453 16.657,-30.717l0.35,0.163c0.527,-0.172 2.346,-0.777 4.72,-1.827 2.746,-1.214 5.761,-3.308 6.032,-3.656 0.262,-0.338 1.542,-3.757 2.038,-6.701 0.496,-2.944 0.636,-5.434 0.636,-5.434l10.785,0.594c0,0 -0.164,3.03 -0.771,6.634 -0.607,3.604 -1.228,7.76 -4.16,11.533 -2.941,3.785 -6.834,5.423 -10.192,6.907 -0.515,0.228 -0.985,0.415 -1.47,0.614 -4.282,9.721 -9.464,18.845 -15.374,27.482 -2.143,3.911 -4.334,7.878 -6.389,11.701 -1.891,3.52 -2.009,6.064 -1.582,7.779 0.427,1.716 1.391,2.83 2.838,3.564 2.895,1.469 8.029,1.307 12.678,-5.167 34.464,-47.995 75.913,-96.166 94.264,-158.992 1.346,-4.607 4.284,-6.877 7.796,-10.137 3.512,-3.26 7.789,-6.76 11.982,-10.234 4.194,-3.474 8.305,-6.924 11.298,-9.834 1.987,-1.932 3.251,-3.824 3.875,-4.688 -1.466,-5.716 -3.862,-11.44 -6.98,-16.951 -6.652,4.271 -13.882,8.2 -19.677,11.374 3.705,-8.941 5.955,-18.367 7.439,-28.048A93.146,93.146 135,0 0,219.909 16.484C207.167,6.252 192.288,-0.015 179.002,0ZM79.175,2.396a37.008,37.008 45,0 0,-1.43 0.006c-7.772,0.181 -17.282,3.126 -26.447,8.084 -4.909,2.656 -9.677,5.898 -14.075,9.513 1.451,11.543 3.797,22.787 8.175,33.354 -7.359,-4.032 -17.027,-9.281 -24.892,-14.904 -3.123,4.919 -5.282,9.915 -6.122,14.671 0.36,1.667 2.121,5.216 5.367,9.158 3.539,4.297 8.436,9.099 13.469,13.75 5.032,4.651 10.194,9.162 14.408,13.137 1.199,1.13 2.311,2.144 3.344,3.125 9.499,-8.775 19.294,-15.295 31.948,-19.58 8.406,-2.847 33.742,-13.097 43.32,-16.991L94.93,9.695C91.371,4.714 86.206,2.504 79.175,2.396ZM223.083,102.35c-2.749,8.759 -5.912,17.227 -9.412,25.438l17.564,9.742 0.046,0.027c9.588,5.567 15.664,3.592 17.796,0.997 1.066,-1.298 1.603,-2.971 1.058,-5.565 -0.545,-2.594 -2.372,-6.076 -6.398,-9.795l-0.175,-0.163 -0.161,-0.177C236.025,114.722 229.322,107.992 223.083,102.35ZM206.998,142.346c-7.308,14.932 -15.633,29.034 -24.456,42.538 16.161,20.258 36.484,36.813 57.289,53.45 10.726,8.577 20.434,7.552 23.22,5.224 1.392,-1.164 1.951,-2.204 1.206,-5.004 -0.746,-2.8 -3.522,-7.248 -9.827,-12.203 -19.065,-14.984 -39.616,-29.175 -55.951,-49.066l7.75,-7.474c15.716,13.888 33.337,25.029 52.199,36.096 6.169,3.62 10.977,4.766 14.03,4.69 3.053,-0.076 4.253,-1.014 5.01,-2.18 1.513,-2.33 1.178,-8.754 -6.423,-14.852l-59.966,-48.104zM175.935,194.77a767.558,767.558 0,0 1,-10.071 14.371c3.428,5.373 6.882,10.734 10.31,16.066 7.079,8.874 15.071,17.143 23.804,24.978 7.572,6.794 15.25,5.855 19.12,3.058 1.936,-1.398 2.855,-3.062 2.916,-4.936 0.061,-1.874 -0.718,-4.469 -4.187,-7.714 -15.887,-14.857 -30.843,-29.085 -41.892,-45.824zM158.501,219.269a2718.228,2718.228 0,0 1,-10.835 14.663c4.528,5.301 9.011,10.582 13.396,15.865 5.089,6.133 10.222,5.934 13.007,4.267 1.392,-0.834 2.276,-2.011 2.582,-3.752 0.306,-1.741 0.01,-4.271 -2.122,-7.65 -2.318,-3.674 -4.783,-7.48 -7.196,-11.234a178.396,178.396 0,0 1,-8.831 -12.158z"
8+
android:fillColor="#000000" />
49
</vector>

‎app/src/main/res/drawable/ic_initiative.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="281.9104dp"
3+
android:height="281.93164dp"
4+
android:viewportWidth="281.9104"
5+
android:viewportHeight="281.93164">
6+
<path
7+
android:pathData="M141.316,0C92.542,-0.1 45.103,25.182 18.937,70.504c-38.946,67.456 -15.906,153.56 51.551,192.506 67.456,38.946 153.546,15.846 192.491,-51.609C301.925,143.945 278.863,57.877 211.407,18.931 189.273,6.152 165.135,0.049 141.316,0.001ZM184.675,62.664c14.333,0.06 28.546,3.628 41.471,11.086 43.534,25.12 56.151,84.976 28.103,133.53C226.201,255.83 168,274.884 124.465,249.764 80.932,224.644 68.341,164.744 96.389,116.192c19.722,-34.14 54.338,-53.672 88.286,-53.528zM226.587,88.103c8.225,13.396 11.425,30.959 9.284,49.677 -4.02,-7.29 -9.866,-13.484 -17.373,-17.806 -24.042,-13.842 -56.235,-3.374 -71.724,23.379 -15.491,26.752 -8.52,59.844 15.523,73.684 6.312,3.634 13.19,5.586 20.18,6.008 -21.868,13.542 -46.222,16.476 -65.398,5.41 -1.186,-0.684 -2.33,-1.418 -3.443,-2.188 4.814,5.125 10.403,9.61 16.74,13.266 38.564,22.252 89.814,5.438 114.659,-37.571 23.423,-40.547 14.912,-89.716 -18.449,-113.86zM194.721,125.327c6.164,0.074 12.28,1.64 17.866,4.855 19.067,10.977 24.527,36.892 12.242,58.108 -12.284,21.216 -37.554,29.518 -56.622,18.541 -16.535,-9.519 -22.802,-30.318 -16.164,-49.512 2.557,10.184 11.833,17.806 22.774,17.806 12.891,0 23.451,-10.579 23.451,-23.466 0,-11.604 -8.564,-21.314 -19.682,-23.131 4.804,-1.998 9.858,-3.094 14.903,-3.196 0.411,-0.008 0.822,-0.01 1.233,-0.004z"
8+
android:fillColor="#000000"/>
9+
</vector>

‎app/src/main/res/drawable/ic_weapon_skill.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="64dp"
3+
android:height="64dp"
4+
android:viewportWidth="265.78864"
5+
android:viewportHeight="272.268">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M176.982,0l-4.86,6.84 22.56,15.984 4.86,-6.864zM124.182,3.024l14.52,27.216 1.08,0.774 8.88,-24.216zM158.742,10.602l-9.84,26.88 24.42,17.286 21.18,-18.924c-0.54,-0.348 -1.14,-0.714 -1.68,-1.104zM15.18,11.664l6.504,27.498 17.778,1.56 1.62,-17.778zM261.822,27.774c-3.36,2.826 -7.32,5.154 -11.7,7.044 3,27.87 -8.82,50.07 -27.12,65.85 -15.9,13.74 -36.54,23.04 -57,28.74 -1.5,2.88 -3,5.52 -4.44,7.86 24.9,3.24 55.92,-12.72 77.52,-36 11.88,-12.78 20.88,-27.54 24.66,-41.52 3.12,-11.64 2.82,-22.452 -1.92,-31.974zM51.042,33l-1.8,19.488 -19.41,-1.74 135.93,162.6 12,-10.02 9.18,-7.68zM239.682,38.382c-2.52,0.6 -5.1,1.2 -7.68,1.62 -8.94,1.5 -18.06,1.86 -26.1,0.18l-24.6,21.966c2.4,4.2 3,9.42 2.7,14.7 -0.36,7.56 -2.58,16.02 -5.58,24.54 -1.8,4.98 -3.78,9.96 -5.94,14.76 16.14,-5.52 31.56,-13.38 43.5,-23.64 15.72,-13.68 25.5,-30.96 23.7,-54.126zM143.682,46.968l-30.72,43.32 18.36,21.9 34.92,-49.26zM83.562,131.808L0,249.648l22.518,15.96 79.344,-111.9zM223.362,179.328l-80.1,66.9 11.52,13.86 80.1,-66.96zM212.382,226.068l-21.18,17.64 23.82,28.56 21.18,-17.64z" />
9+
</vector>

0 commit comments

Comments
 (0)