diff --git a/base/all-all/sbardef.lmp b/base/all-all/sbardef.lmp index 0f35134ee..289e27edd 100644 --- a/base/all-all/sbardef.lmp +++ b/base/all-all/sbardef.lmp @@ -1967,6 +1967,1046 @@ } ] }, + { + "height": 200, + "fullscreenrender": true, + "fillflat": null, + "children": + [ + { + "number": + { + "x": 44, + "y": 171, + "alignment": 18, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 4, + "param": 0, + "maxlength": 3, + "conditions": + [ + { + "condition": 4, + "param": 0 + } + ], + "children": null + } + }, + { + "percent": + { + "x": 104, + "y": 171, + "alignment": 18, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 0, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "percent": + { + "x": 235, + "y": 171, + "alignment": 34, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 1, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 138, + "y": 171, + "alignment": 18, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 2, + "param": 0, + "maxlength": 2, + "conditions": + [ + { + "condition": 14, + "param": 2 + } + ], + "children": null + } + }, + { + "canvas": + { + "x": 104, + "y": 168, + "alignment": 0, + "conditions": + [ + { + "condition": 15, + "param": 2 + } + ], + "children": + [ + { + "graphic": + { + "x": 7, + "y": 4, + "alignment": 16, + "patch": "STGNUM2", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 2 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 7, + "y": 4, + "alignment": 16, + "patch": "STYSNUM2", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 2 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 4, + "alignment": 16, + "patch": "STGNUM3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 3 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 4, + "alignment": 16, + "patch": "STYSNUM3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 3 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 4, + "alignment": 16, + "patch": "STGNUM4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 4, + "alignment": 16, + "patch": "STYSNUM4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 7, + "y": 14, + "alignment": 16, + "patch": "STGNUM5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 7, + "y": 14, + "alignment": 16, + "patch": "STYSNUM5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 14, + "alignment": 16, + "patch": "STGNUM6", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 14, + "alignment": 16, + "patch": "STYSNUM6", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 14, + "alignment": 16, + "patch": "STGNUM7", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 7 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 14, + "alignment": 16, + "patch": "STYSNUM7", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 7 + } + ], + "children": null + } + } + ] + } + }, + { + "number": + { + "x": 288, + "y": 173, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 173, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 288, + "y": 179, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 1, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 179, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 1, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 288, + "y": 185, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 3, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 185, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 3, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 288, + "y": 191, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 2, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 191, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 2, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS0", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 1 + }, + { + "condition": 11, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 11, + "param": 1 + }, + { + "condition": 10, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 1 + }, + { + "condition": 10, + "param": 4 + }, + { + "condition": 13, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS6", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 1 + }, + { + "condition": 10, + "param": 4 + }, + { + "condition": 12, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS1", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 2 + }, + { + "condition": 11, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 11, + "param": 2 + }, + { + "condition": 10, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 2 + }, + { + "condition": 10, + "param": 5 + }, + { + "condition": 13, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS7", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 2 + }, + { + "condition": 10, + "param": 5 + }, + { + "condition": 12, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS2", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 3 + }, + { + "condition": 11, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 11, + "param": 3 + }, + { + "condition": 10, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 3 + }, + { + "condition": 10, + "param": 6 + }, + { + "condition": 13, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS8", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 3 + }, + { + "condition": 10, + "param": 6 + }, + { + "condition": 12, + "param": 1 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 160, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 0, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 4 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 152, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 4 + }, + { + "condition": 20, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 160, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 4 + }, + { + "condition": 21, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 152, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 0, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 3 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 144, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 3 + }, + { + "condition": 20, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 152, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 3 + }, + { + "condition": 21, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 320, + "y": 8, + "alignment": 34, + "tranmap": null, + "translation": null, + "type": 2, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 320, + "y": 0, + "alignment": 34, + "tranmap": null, + "translation": null, + "type": 3, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 8, + "alignment": 0, + "tranmap": null, + "translation": null, + "type": 4, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 320, + "y": 167, + "alignment": 42, + "tranmap": null, + "translation": null, + "type": 5, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 160, + "y": 167, + "alignment": 9, + "tranmap": null, + "translation": null, + "type": 6, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 0, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 7, + "font": "Console", + "duration": 4, + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 160, + "y": 52, + "alignment": 1, + "tranmap": null, + "translation": null, + "type": 8, + "font": "Console", + "duration": 2.5, + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 8, + "alignment": 16, + "tranmap": null, + "translation": "CRGOLD", + "type": 9, + "font": "Console", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 160, + "alignment": 16, + "tranmap": null, + "translation": "CRGOLD", + "type": 10, + "font": "Console", + "conditions": + [ + { + "condition": 19, + "param": 3 + } + ], + "children": null + } + }, + { + "carousel": + { + "x": 0, + "y": 18, + "alignment": 0, + "tranmap": null, + "translation": null, + "conditions": null, + "children": null + } + } + ] + }, { "height": 200, "fullscreenrender": true, diff --git a/base/extras.wad/sbardef.lmp b/base/extras.wad/sbardef.lmp index 0f35134ee..289e27edd 100644 --- a/base/extras.wad/sbardef.lmp +++ b/base/extras.wad/sbardef.lmp @@ -1967,6 +1967,1046 @@ } ] }, + { + "height": 200, + "fullscreenrender": true, + "fillflat": null, + "children": + [ + { + "number": + { + "x": 44, + "y": 171, + "alignment": 18, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 4, + "param": 0, + "maxlength": 3, + "conditions": + [ + { + "condition": 4, + "param": 0 + } + ], + "children": null + } + }, + { + "percent": + { + "x": 104, + "y": 171, + "alignment": 18, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 0, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "percent": + { + "x": 235, + "y": 171, + "alignment": 34, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 1, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 138, + "y": 171, + "alignment": 18, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 2, + "param": 0, + "maxlength": 2, + "conditions": + [ + { + "condition": 14, + "param": 2 + } + ], + "children": null + } + }, + { + "canvas": + { + "x": 104, + "y": 168, + "alignment": 0, + "conditions": + [ + { + "condition": 15, + "param": 2 + } + ], + "children": + [ + { + "graphic": + { + "x": 7, + "y": 4, + "alignment": 16, + "patch": "STGNUM2", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 2 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 7, + "y": 4, + "alignment": 16, + "patch": "STYSNUM2", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 2 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 4, + "alignment": 16, + "patch": "STGNUM3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 3 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 4, + "alignment": 16, + "patch": "STYSNUM3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 3 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 4, + "alignment": 16, + "patch": "STGNUM4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 4, + "alignment": 16, + "patch": "STYSNUM4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 7, + "y": 14, + "alignment": 16, + "patch": "STGNUM5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 7, + "y": 14, + "alignment": 16, + "patch": "STYSNUM5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 14, + "alignment": 16, + "patch": "STGNUM6", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 14, + "alignment": 16, + "patch": "STYSNUM6", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 14, + "alignment": 16, + "patch": "STGNUM7", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 7 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 14, + "alignment": 16, + "patch": "STYSNUM7", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 7 + } + ], + "children": null + } + } + ] + } + }, + { + "number": + { + "x": 288, + "y": 173, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 173, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 288, + "y": 179, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 1, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 179, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 1, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 288, + "y": 185, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 3, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 185, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 3, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 288, + "y": 191, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 2, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 191, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 2, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS0", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 1 + }, + { + "condition": 11, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 11, + "param": 1 + }, + { + "condition": 10, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 1 + }, + { + "condition": 10, + "param": 4 + }, + { + "condition": 13, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS6", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 1 + }, + { + "condition": 10, + "param": 4 + }, + { + "condition": 12, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS1", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 2 + }, + { + "condition": 11, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 11, + "param": 2 + }, + { + "condition": 10, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 2 + }, + { + "condition": 10, + "param": 5 + }, + { + "condition": 13, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS7", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 2 + }, + { + "condition": 10, + "param": 5 + }, + { + "condition": 12, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS2", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 3 + }, + { + "condition": 11, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 11, + "param": 3 + }, + { + "condition": 10, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 3 + }, + { + "condition": 10, + "param": 6 + }, + { + "condition": 13, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS8", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 3 + }, + { + "condition": 10, + "param": 6 + }, + { + "condition": 12, + "param": 1 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 160, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 0, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 4 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 152, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 4 + }, + { + "condition": 20, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 160, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 4 + }, + { + "condition": 21, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 152, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 0, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 3 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 144, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 3 + }, + { + "condition": 20, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 152, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 3 + }, + { + "condition": 21, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 320, + "y": 8, + "alignment": 34, + "tranmap": null, + "translation": null, + "type": 2, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 320, + "y": 0, + "alignment": 34, + "tranmap": null, + "translation": null, + "type": 3, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 8, + "alignment": 0, + "tranmap": null, + "translation": null, + "type": 4, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 320, + "y": 167, + "alignment": 42, + "tranmap": null, + "translation": null, + "type": 5, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 160, + "y": 167, + "alignment": 9, + "tranmap": null, + "translation": null, + "type": 6, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 0, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 7, + "font": "Console", + "duration": 4, + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 160, + "y": 52, + "alignment": 1, + "tranmap": null, + "translation": null, + "type": 8, + "font": "Console", + "duration": 2.5, + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 8, + "alignment": 16, + "tranmap": null, + "translation": "CRGOLD", + "type": 9, + "font": "Console", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 160, + "alignment": 16, + "tranmap": null, + "translation": "CRGOLD", + "type": 10, + "font": "Console", + "conditions": + [ + { + "condition": 19, + "param": 3 + } + ], + "children": null + } + }, + { + "carousel": + { + "x": 0, + "y": 18, + "alignment": 0, + "tranmap": null, + "translation": null, + "conditions": null, + "children": null + } + } + ] + }, { "height": 200, "fullscreenrender": true, diff --git a/base/id1.wad/sbardef.lmp b/base/id1.wad/sbardef.lmp index dc02a73dc..1e2ec03ec 100644 --- a/base/id1.wad/sbardef.lmp +++ b/base/id1.wad/sbardef.lmp @@ -1967,6 +1967,1046 @@ } ] }, + { + "height": 200, + "fullscreenrender": true, + "fillflat": null, + "children": + [ + { + "number": + { + "x": 44, + "y": 171, + "alignment": 18, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 4, + "param": 0, + "maxlength": 3, + "conditions": + [ + { + "condition": 4, + "param": 0 + } + ], + "children": null + } + }, + { + "percent": + { + "x": 104, + "y": 171, + "alignment": 18, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 0, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "percent": + { + "x": 235, + "y": 171, + "alignment": 34, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 1, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 138, + "y": 171, + "alignment": 18, + "font": "BigRed", + "tranmap": null, + "translation": null, + "type": 2, + "param": 0, + "maxlength": 2, + "conditions": + [ + { + "condition": 14, + "param": 2 + } + ], + "children": null + } + }, + { + "canvas": + { + "x": 104, + "y": 168, + "alignment": 0, + "conditions": + [ + { + "condition": 15, + "param": 2 + } + ], + "children": + [ + { + "graphic": + { + "x": 7, + "y": 4, + "alignment": 16, + "patch": "STGNUM2", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 2 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 7, + "y": 4, + "alignment": 16, + "patch": "STYSNUM2", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 2 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 4, + "alignment": 16, + "patch": "STGNUM3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 3 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 4, + "alignment": 16, + "patch": "STYSNUM3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 3 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 4, + "alignment": 16, + "patch": "STGNUM4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 4, + "alignment": 16, + "patch": "STYSNUM4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 7, + "y": 14, + "alignment": 16, + "patch": "STGNUM5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 7, + "y": 14, + "alignment": 16, + "patch": "STYSNUM5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 14, + "alignment": 16, + "patch": "STGNUM6", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 19, + "y": 14, + "alignment": 16, + "patch": "STYSNUM6", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 14, + "alignment": 16, + "patch": "STGNUM7", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 7, + "param": 7 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 31, + "y": 14, + "alignment": 16, + "patch": "STYSNUM7", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 6, + "param": 7 + } + ], + "children": null + } + } + ] + } + }, + { + "number": + { + "x": 288, + "y": 173, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 173, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 0, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 288, + "y": 179, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 1, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 179, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 1, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 288, + "y": 185, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 3, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 185, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 3, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 288, + "y": 191, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 3, + "param": 2, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "number": + { + "x": 314, + "y": 191, + "alignment": 34, + "font": "SmallYellow", + "tranmap": null, + "translation": null, + "type": 5, + "param": 2, + "maxlength": 3, + "conditions": null, + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS0", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 1 + }, + { + "condition": 11, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 11, + "param": 1 + }, + { + "condition": 10, + "param": 4 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS3", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 1 + }, + { + "condition": 10, + "param": 4 + }, + { + "condition": 13, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 171, + "alignment": 32, + "patch": "STKEYS6", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 1 + }, + { + "condition": 10, + "param": 4 + }, + { + "condition": 12, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS1", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 2 + }, + { + "condition": 11, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 11, + "param": 2 + }, + { + "condition": 10, + "param": 5 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS4", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 2 + }, + { + "condition": 10, + "param": 5 + }, + { + "condition": 13, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 181, + "alignment": 32, + "patch": "STKEYS7", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 2 + }, + { + "condition": 10, + "param": 5 + }, + { + "condition": 12, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS2", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 3 + }, + { + "condition": 11, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 11, + "param": 3 + }, + { + "condition": 10, + "param": 6 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS5", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 3 + }, + { + "condition": 10, + "param": 6 + }, + { + "condition": 13, + "param": 1 + } + ], + "children": null + } + }, + { + "graphic": + { + "x": 239, + "y": 191, + "alignment": 32, + "patch": "STKEYS8", + "tranmap": null, + "translation": null, + "conditions": + [ + { + "condition": 10, + "param": 3 + }, + { + "condition": 10, + "param": 6 + }, + { + "condition": 12, + "param": 1 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 160, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 0, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 4 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 152, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 4 + }, + { + "condition": 20, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 160, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 4 + }, + { + "condition": 21, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 152, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 0, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 3 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 144, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 3 + }, + { + "condition": 20, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 2, + "y": 152, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 1, + "font": "Digits", + "conditions": + [ + { + "condition": 19, + "param": 3 + }, + { + "condition": 21, + "param": 0 + } + ], + "children": null + } + }, + { + "widget": + { + "x": 320, + "y": 8, + "alignment": 34, + "tranmap": null, + "translation": null, + "type": 2, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 320, + "y": 0, + "alignment": 34, + "tranmap": null, + "translation": null, + "type": 3, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 8, + "alignment": 0, + "tranmap": null, + "translation": null, + "type": 4, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 320, + "y": 167, + "alignment": 42, + "tranmap": null, + "translation": null, + "type": 5, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 160, + "y": 167, + "alignment": 9, + "tranmap": null, + "translation": null, + "type": 6, + "font": "Digits", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 0, + "alignment": 16, + "tranmap": null, + "translation": null, + "type": 7, + "font": "Console", + "duration": 4, + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 160, + "y": 52, + "alignment": 1, + "tranmap": null, + "translation": null, + "type": 8, + "font": "Console", + "duration": 2.5, + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 8, + "alignment": 16, + "tranmap": null, + "translation": "CRGOLD", + "type": 9, + "font": "Console", + "conditions": null, + "children": null + } + }, + { + "widget": + { + "x": 0, + "y": 160, + "alignment": 16, + "tranmap": null, + "translation": "CRGOLD", + "type": 10, + "font": "Console", + "conditions": + [ + { + "condition": 19, + "param": 3 + } + ], + "children": null + } + }, + { + "carousel": + { + "x": 0, + "y": 18, + "alignment": 0, + "tranmap": null, + "translation": null, + "conditions": null, + "children": null + } + } + ] + }, { "height": 200, "fullscreenrender": true, diff --git a/src/mn_internal.h b/src/mn_internal.h index 24c991966..3a12fff57 100644 --- a/src/mn_internal.h +++ b/src/mn_internal.h @@ -45,6 +45,8 @@ typedef enum key_mode } menu_input_mode_t; +extern int maxscreenblocks; + extern int bigfont_priority; extern menu_input_mode_t help_input, old_help_input; // pad_mode or key_mode. diff --git a/src/mn_menu.c b/src/mn_menu.c index 4de099ada..b41deddc6 100644 --- a/src/mn_menu.c +++ b/src/mn_menu.c @@ -76,7 +76,7 @@ // Blocky mode, has default, 0 = high, 1 = normal // int detailLevel; obsolete -- killough -int screenblocks; // has default +int screenblocks, maxscreenblocks; // has default static int quickSaveSlot; // -1 = no quicksave slot picked! @@ -1798,7 +1798,7 @@ static void M_SizeDisplay(int choice) default: break; } - screenblocks = BETWEEN(3, 12, screenblocks); + screenblocks = BETWEEN(3, maxscreenblocks, screenblocks); R_SetViewSize(screenblocks /*, detailLevel obsolete -- killough */); } @@ -2549,7 +2549,7 @@ boolean M_ShortcutResponder(const event_t *ev) else { ++screenblocks; - if (screenblocks > 12) + if (screenblocks > maxscreenblocks) { screenblocks = 10; } diff --git a/src/mn_setup.c b/src/mn_setup.c index d7dd3c93d..8d6c76e48 100644 --- a/src/mn_setup.c +++ b/src/mn_setup.c @@ -1816,12 +1816,6 @@ static void RefreshSolidBackground(void) st_refresh_background = true; } -static const char *screensize_strings[] = { - "", "", "", "Status Bar", "Status Bar", - "Status Bar", "Status Bar", "Status Bar", "Status Bar", "Status Bar", - "Status Bar", "Fullscreen", "Fullscreen" -}; - static const char *st_layout_strings[] = { "Original", "Wide" }; @@ -4784,7 +4778,7 @@ static const char **selectstrings[] = { percent_strings, curve_strings, center_weapon_strings, - screensize_strings, + NULL, // str_screensize st_layout_strings, show_widgets_strings, show_adv_widgets_strings, @@ -4842,6 +4836,29 @@ static const char **GetMidiPlayerStrings(void) return I_DeviceList(); } +static const char **GetScreenSizeStrings(void) +{ + const char **strings = NULL; + + for (int i = 0; i < 3; ++i) + { + array_push(strings, ""); + } + for (int i = 3; i < 10; ++i) + { + array_push(strings, "Status Bar"); + } + + const char **st_strings = ST_StatusbarList(); + for (int i = 0; i < array_size(st_strings); ++i) + { + array_push(strings, st_strings[i]); + } + + maxscreenblocks = array_size(strings) - 1; + return strings; +} + void MN_InitMenuStrings(void) { UpdateWeaponSlotLabels(); @@ -4854,6 +4871,7 @@ void MN_InitMenuStrings(void) selectstrings[str_gyro_sens] = GetGyroSensitivityStrings(); selectstrings[str_gyro_accel] = GetGyroAccelStrings(); selectstrings[str_resampler] = GetResamplerStrings(); + selectstrings[str_screensize] = GetScreenSizeStrings(); } void MN_SetupResetMenu(void) diff --git a/src/r_main.c b/src/r_main.c index 7efe9e6df..afa95282f 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1031,7 +1031,7 @@ void R_BindRenderVariables(void) BIND_NUM_GENERAL(invul_mode, INVUL_MBF, INVUL_VANILLA, INVUL_GRAY, "Invulnerability effect (0 = Vanilla; 1 = MBF; 2 = Gray)"); BIND_BOOL(flashing_hom, true, "Enable flashing of the HOM indicator"); - BIND_NUM(screenblocks, 10, 3, 12, "Size of game-world screen"); + BIND_NUM(screenblocks, 10, 3, UL, "Size of game-world screen"); M_BindBool("translucency", &translucency, NULL, true, ss_gen, wad_yes, "Translucency for some things"); diff --git a/src/st_stuff.c b/src/st_stuff.c index 732bd8ce7..54fa1f5d0 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -1020,6 +1020,11 @@ static void UpdateStatusBar(player_t *player) int barindex = MAX(screenblocks - 10, 0); + if (barindex >= array_size(sbardef->statusbars)) + { + barindex = array_size(sbardef->statusbars) - 1; + } + if (automapactive && automapoverlay == AM_OVERLAY_OFF) { barindex = 0; @@ -1833,6 +1838,35 @@ void ST_InitRes(void) PU_RENDERER, 0); } +const char **ST_StatusbarList(void) +{ + if (!sbardef) + { + return NULL; + } + + static const char **strings; + + if (array_size(strings)) + { + return strings; + } + + statusbar_t *item; + array_foreach(item, sbardef->statusbars) + { + if (item->fullscreenrender) + { + array_push(strings, "Fullscreen"); + } + else + { + array_push(strings, "Status Bar"); + } + } + return strings; +} + void ST_ResetPalette(void) { I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE)); diff --git a/src/st_stuff.h b/src/st_stuff.h index d58e67329..5a935db9f 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -74,6 +74,8 @@ extern struct patch_s **hu_font; void WI_UpdateWidgets(void); void WI_DrawWidgets(void); +const char **ST_StatusbarList(void); + void ST_BindSTSVariables(void); #endif