Promotion picker allowing picking chains in one go (#9655)

* Try to allow chained promotion picking

* Reorg PromotionPickerScreen into own package

* Draft for new PromotionTree

* Change PromotionPickerScreen to use new tree (picking still not done)

* Finish new PromotionPickerScreen - code

* Finish new PromotionPickerScreen - assets and linting

* Finish new PromotionPickerScreen - polish positioning and lines

* Finish new PromotionPickerScreen - fix sound

* Finish new PromotionPickerScreen - little optimization

* Finish new PromotionPickerScreen - emphasize line along path

* Finish new PromotionPickerScreen - merge fix

* Finish new PromotionPickerScreen - address comments

* Finish new PromotionPickerScreen - fix sort and update wiki
This commit is contained in:
SomeTroglodyte
2023-06-28 09:49:35 +02:00
committed by GitHub
parent d298f85099
commit c45d3ecb7c
14 changed files with 564 additions and 400 deletions

View File

@ -82,6 +82,60 @@
"g": 0.0627451,
"b": 0.039215688,
"a": 1
},
"promotion-default": {
"r": 0,
"g": 0,
"b": 0,
"a": 1
},
"promotion-selected": {
"r": 0.2824,
"g": 0.5765,
"b": 0.6863,
"a": 1
},
"promotion-path": {
"r": 0.1882,
"g": 0.3843,
"b": 0.4575,
"a": 1
},
"promotion-promoted": {
"r": 0.8,
"g": 0.6745,
"b": 0,
"a": 1
},
"promotion-promoted-text": {
"r": 0.16,
"g": 0.1349,
"b": 0,
"a": 1
},
"promotion-pickable": {
"r": 0.1098,
"g": 0.3137,
"b": 0,
"a": 1
},
"promotion-prerequisite": {
"r": 0.405,
"g": 0.506,
"b": 0.81,
"a": 1
},
"promotion-grouplines": {
"r": 1,
"g": 1,
"b": 1,
"a": 1
},
"promotion-otherlines": {
"r": 1,
"g": 0.7,
"b": 0,
"a": 0
}
},
"com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable": {
@ -319,5 +373,18 @@
"cursor": "white",
"selection": "selection"
}
},
"com.unciv.ui.screens.pickerscreens.PromotionScreenColors": {
"default": {
"default": "promotion-default",
"selected": "promotion-selected",
"pathToSelection": "promotion-path",
"promoted": "promotion-promoted",
"promotedText": "promotion-promoted-text",
"pickable": "promotion-pickable",
"prerequisite": "promotion-prerequisite",
"groupLines": "promotion-grouplines",
"otherLines": "promotion-otherlines"
}
}
}

View File

@ -1685,6 +1685,7 @@ Dogfighting III = Kurvenkampf III
Choose name for [unitName] = Wähle Namen für [unitName]
[unitFilter] units gain the [promotion] promotion = [unitFilter] Einheiten erhalten die [promotion] Beförderung
Requires = Benötigt
Path to [promotion] is ambiguous = Der Weg zu [promotion] ist noch nicht klar
# Multiplayer Turn Checker Service

View File

@ -1684,6 +1684,7 @@ Dogfighting III =
Choose name for [unitName] =
[unitFilter] units gain the [promotion] promotion =
Requires =
Path to [promotion] is ambiguous =
# Multiplayer Turn Checker Service