Skip to content

Commit

Permalink
Merge pull request flareteam#456 from dorkster/fixes
Browse files Browse the repository at this point in the history
Update numbered slot syntax in menus/actionbar.txt
  • Loading branch information
igorko committed Dec 31, 2014
2 parents caf2bae + a3e5ed0 commit 2f132fb
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 44 deletions.
38 changes: 16 additions & 22 deletions mods/fantasycore/menus/actionbar.txt
Expand Up @@ -4,28 +4,22 @@
pos=0,0,640,35
align=bottom

slot1=32,3,32,32
slot2=64,3,32,32
slot3=96,3,32,32
slot4=128,3,32,32
slot5=160,3,32,32
slot6=192,3,32,32
slot7=224,3,32,32
slot8=256,3,32,32
slot9=288,3,32,32
slot10=320,3,32,32
slot=1,32,3
slot=2,64,3
slot=3,96,3
slot=4,128,3
slot=5,160,3
slot=6,192,3
slot=7,224,3
slot=8,256,3
slot=9,288,3
slot=10,320,3

slot_M1=384,3,32,32
slot_M2=416,3,32,32
slot_M1=384,3
slot_M2=416,3

char_menu=480,3,32,32
inv_menu=512,3,32,32
powers_menu=544,3,32,32
log_menu=576,3,32,32
char_menu=480,3
inv_menu=512,3
powers_menu=544,3
log_menu=576,3

# screen areas occupied by the three main sections
# TODO maybe we should calculate them
# x,width,height. y is ignored, since it is taken from the "pos" key's y value
numberArea=32,0,320,32
mouseArea=384,0,64,32
menuArea=480,0,128,32
38 changes: 16 additions & 22 deletions mods/minicore/menus/actionbar.txt
Expand Up @@ -4,28 +4,22 @@
pos=0,0,320,18
align=bottom

slot1=16,1,16,16
slot2=32,1,16,16
slot3=48,1,16,16
slot4=64,1,16,16
slot5=80,1,16,16
slot6=96,1,16,16
slot7=112,1,16,16
slot8=128,1,16,16
slot9=144,1,16,16
slot10=160,1,16,16
slot=1,16,1
slot=2,32,1
slot=3,48,1
slot=4,64,1
slot=5,80,1
slot=6,96,1
slot=7,112,1
slot=8,128,1
slot=9,144,1
slot=10,160,1

slot_M1=192,1,16,16
slot_M2=208,1,16,16
slot_M1=192,1
slot_M2=208,1

char_menu=240,1,16,16
inv_menu=256,1,16,16
powers_menu=272,1,16,16
log_menu=288,1,16,16
char_menu=240,1
inv_menu=256,1
powers_menu=272,1
log_menu=288,1

# screen areas occupied by the three main sections
# TODO maybe we should calculate them
# x,width,height. y is ignored, since it is taken from the "pos" key's y value
numberArea=16,0,160,16
mouseArea=192,0,32,16
menuArea=240,0,64,16

0 comments on commit 2f132fb

Please sign in to comment.