- update font code

- update gamefiles
dgcor · Jul 10, 2016 · 7f20f12 · 7f20f12
1 parent fe8d7bd
commit 7f20f12
Show file tree

Hide file tree

Showing 37 changed files with 371 additions and 253 deletions.
diff --git a/gamefiles/res/level/bigtgoldCharMap.bin b/gamefiles/res/level/bigtgoldCharMap.bin
diff --git a/gamefiles/res/level/bigtgoldSize.bin b/gamefiles/res/level/bigtgoldSize.bin
diff --git a/gamefiles/res/level/fonts.json b/gamefiles/res/level/fonts.json
@@ -5,24 +5,23 @@
       "textureId": "smaltext",
       "palette": "town",
       "file": "ctrlpan/smaltext.cel",
-      "charMapFile": "res/level/smaltextMap.bin",
-      "charMapIgnore": 255
+      "charMapFile": "res/level/smaltextCharMap.bin",
+      "charSizeFile": "res/level/smaltextSize.bin"
     },
     {
       "id": "medtexts",
       "textureId": "medtexts",
       "palette": "town",
       "file": "data/medtexts.cel",
-      "charMapFile": "res/level/medBigCharMap.bin",
-      "charMapIgnore": 255
+      "charMapFile": "res/level/medtextsCharMap.bin",
+      "charSizeFile": "res/level/medtextsSize.bin"
     },
     {
       "id": "bigtgold",
       "textureId": "bigtgold",
       "palette": "town",
       "file": "data/bigtgold.cel",
-      "charMapFile": "res/level/medBigCharMap.bin",
-      "charMapIgnore": 255,
+      "charMapFile": "res/level/bigtgoldCharMap.bin",
       "charSizeFile": "res/level/bigtgoldSize.bin"
     }
   ]

diff --git a/gamefiles/res/level/medtextsCharMap.bin b/gamefiles/res/level/medtextsCharMap.bin
diff --git a/gamefiles/res/level/medtextsSize.bin b/gamefiles/res/level/medtextsSize.bin
diff --git a/gamefiles/res/level/smaltextCharMap.bin b/gamefiles/res/level/smaltextCharMap.bin
diff --git a/gamefiles/res/level/smaltextSize.bin b/gamefiles/res/level/smaltextSize.bin
diff --git a/gamefiles/ui/level/charPanelLabels.json b/gamefiles/ui/level/charPanelLabels.json
@@ -7,6 +7,7 @@
       "position": [84, 20],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.name|"
     },
     {
@@ -15,6 +16,7 @@
       "position": [236, 20],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.class|"
     },
     {
@@ -23,6 +25,7 @@
       "position": [85, 56],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.level|"
     },
     {
@@ -31,6 +34,7 @@
       "position": [256, 56],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.experience|"
     },
     {
@@ -39,6 +43,7 @@
       "position": [256, 84],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.expNextLevel|"
     },
     {
@@ -47,6 +52,7 @@
       "position": [256, 134],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.gold|"
     },
     {
@@ -55,6 +61,7 @@
       "position": [108, 144],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.strengthBase|"
     },
     {
@@ -63,6 +70,7 @@
       "position": [156, 144],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.strengthNow|"
     },
     {
@@ -71,6 +79,7 @@
       "position": [108, 172],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.magicBase|"
     },
     {
@@ -79,6 +88,7 @@
       "position": [156, 172],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.magicNow|"
     },
     {
@@ -87,6 +97,7 @@
       "position": [108, 200],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.dexterityBase|"
     },
     {
@@ -95,6 +106,7 @@
       "position": [156, 200],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.dexterityNow|"
     },
     {
@@ -103,6 +115,7 @@
       "position": [108, 228],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.vitalityBase|"
     },
     {
@@ -111,6 +124,7 @@
       "position": [156, 228],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.vitalityNow|"
     },
     {
@@ -119,6 +133,7 @@
       "position": [108, 256],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.points|",
       "format": ""
     },
@@ -128,6 +143,7 @@
       "position": [108, 292],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.lifeBase|"
     },
     {
@@ -136,6 +152,7 @@
       "position": [156, 292],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.lifeNow|"
     },
     {
@@ -144,6 +161,7 @@
       "position": [108, 320],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.manaBase|"
     },
     {
@@ -152,6 +170,7 @@
       "position": [156, 320],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.manaNow|"
     },
     {
@@ -160,6 +179,7 @@
       "position": [278, 172],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.armorClass|"
     },
     {
@@ -168,6 +188,7 @@
       "position": [278, 200],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.toHit|",
       "format": "[1]%"
     },
@@ -177,6 +198,7 @@
       "position": [278, 228],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": ["|currentLevel|currentPlayer.damageMin|", "|currentLevel|currentPlayer.damageMax|"],
       "format": "[1]-[2]"
     },
@@ -186,6 +208,7 @@
       "position": [278, 266],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.resistMagic|",
       "format": "[1]%"
     },
@@ -195,6 +218,7 @@
       "position": [278, 292],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.resistFire|",
       "format": "[1]%"
     },
@@ -204,6 +228,7 @@
       "position": [278, 320],
       "anchor": "left",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 1,
       "binding": "|currentLevel|currentPlayer.resistLightning|",
       "format": "[1]%"
     }

diff --git a/gamefiles/ui/level/charPanelQuests.json b/gamefiles/ui/level/charPanelQuests.json
@@ -56,9 +56,10 @@
   "menu": {
     "id": "menuQuests",
     "bitmapFont": "smaltext",
-    "position": [162, 128],
+    "position": [160, 135],
     "horizontalAlign": "center",
     "verticalAlign": "center",
+    "horizontalSpaceOffset": 1,
     "anchor": "left",
     "focus": true,
     "focusSound": "titlemov",
@@ -89,7 +90,9 @@
     "bitmapFont": "smaltext",
     "focus": true,
     "focusSound": "titlemov",
-    "position": [92, 297],
+    "position": [160, 298],
+    "horizontalAlign": "center",
+    "horizontalSpaceOffset": 1,
     "sound": "titlslct",
     "text": "Close Quest Log",
     "onClick": [

diff --git a/gamefiles/ui/level/gameMenu.json b/gamefiles/ui/level/gameMenu.json
@@ -8,9 +8,10 @@
       "focus": true,
       "focusSound": "titlemov",
       "text": "Save Game",
-      "position": [319, 116],
+      "position": [321, 116],
       "anchor": "none",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 2,
       "onFocus": [
         "anchorLeftPentagram",
         "anchorRightPentagram"
@@ -23,9 +24,10 @@
       "focus": true,
       "focusSound": "titlemov",
       "text": "Options",
-      "position": [319, 161],
+      "position": [321, 161],
       "anchor": "none",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 2,
       "onClick": [
         { "name": "resource.pop" },
         { "name": "load", "file": "ui/level/gameMenu2.json" }
@@ -42,9 +44,10 @@
       "focus": true,
       "focusSound": "titlemov",
       "text": "New Game",
-      "position": [319, 206],
+      "position": [321, 206],
       "anchor": "none",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 2,
       "onClick": [
         { "name": "resource.popAll" },
         { "name": "game.setProperty", "property": "musicVolume", "value": 100 },
@@ -64,9 +67,10 @@
       "focus": true,
       "focusSound": "titlemov",
       "text": "Load Game",
-      "position": [319, 251],
+      "position": [320, 251],
       "anchor": "none",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 2,
       "onFocus": [
         "anchorLeftPentagram",
         "anchorRightPentagram"
@@ -79,9 +83,10 @@
       "focus": true,
       "focusSound": "titlemov",
       "text": "Quit Diablo",
-      "position": [319, 296],
+      "position": [321, 296],
       "anchor": "none",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 2,
       "onClick": [
         {
           "name": "game.fadeOut",

diff --git a/gamefiles/ui/level/gameMenu2.json b/gamefiles/ui/level/gameMenu2.json
@@ -214,6 +214,7 @@
       "focusOnClick": false,
       "text": "Music",
       "position": [75, 116],
+      "horizontalSpaceOffset": 2,
       "anchor": "none",
       "onClick": [
         "anchorLeftPentagram",
@@ -244,6 +245,7 @@
       "text": "Sound",
       "position": [75, 161],
       "anchor": "none",
+      "horizontalSpaceOffset": 2,
       "onClick": [
         "anchorLeftPentagram",
         { "name": "drawable.anchor", "id": "pent2", "idAnchor": "optbar2", "anchor": "right" },
@@ -273,6 +275,7 @@
       "text": "Gamma",
       "position": [75, 206],
       "anchor": "none",
+      "horizontalSpaceOffset": 2,
       "onClick": [
         "anchorLeftPentagram",
         { "name": "drawable.anchor", "id": "pent2", "idAnchor": "optbar3", "anchor": "right" },
@@ -300,9 +303,10 @@
       "focus": true,
       "focusSound": "titlemov",
       "text": "Color Cycling On",
-      "position": [319, 251],
+      "position": [320, 251],
       "anchor": "none",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 2,
       "onClick": [
         { "name": "button.setText", "id": "colorCycling", "text": "Color Cycling Off" },
         "anchorLeftPentagram",
@@ -325,9 +329,10 @@
       "focus": true,
       "focusSound": "titlemov",
       "text": "Previous Menu",
-      "position": [319, 296],
+      "position": [320, 296],
       "anchor": "none",
       "horizontalAlign": "center",
+      "horizontalSpaceOffset": 2,
       "onClick": [
         { "name": "resource.pop" },
         { "name": "load", "file": "ui/level/saveSettings.json" },

diff --git a/gamefiles/ui/level/gameMenuCommon.json b/gamefiles/ui/level/gameMenuCommon.json
@@ -5,12 +5,12 @@
     {
       "name": "action.set",
       "id": "anchorLeftPentagram",
-      "action": { "name": "drawable.anchorToFocused", "id": "pent1", "anchor": "left" }
+      "action": { "name": "drawable.anchorToFocused", "id": "pent1", "anchor": "left", "offset": [-1, 0] }
     },
     {
       "name": "action.set",
       "id": "anchorRightPentagram",
-      "action": { "name": "drawable.anchorToFocused", "id": "pent2", "anchor": "right" }
+      "action": { "name": "drawable.anchorToFocused", "id": "pent2", "anchor": "right", "offset": [1, 0] }
     }
   ],
   "keyboard": [