40-step coloured lighting instead of previous 256 steps, reducing memory usage by half (size of array of 'int' > size of array of 'char'), kerning in bitmap fonts (interchar, spacing of unihan/hangul/kana), new jp/kr unihan font from chinese font as jp/kr language has slightly different glyph for certain han character

Former-commit-id: 5d88e02857e6d33d87421fb5a2a39b423c540e0f Former-commit-id: e4ea5a98bf738db1478fa91dbd4a43231c2354af
2026-06-10 02:24:05 +09:00 · 2016-02-21 01:26:56 +09:00
parent b4c2108dc3
commit e3c382e1fb
66 changed files with 591 additions and 283 deletions
--- a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col216.class
+++ b/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col216.class
--- a/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col40.class
+++ b/out/production/Terrarum_renewed/com/Torvald/ColourUtil/Col40.class
--- a/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontBase.class
+++ b/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontBase.class
--- a/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontWhite.class
+++ b/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontWhite.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ABOUT
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ABOUT
@@ -147,7 +147,7 @@ HEARTS, CLUBS, DIAMONDS, SPADES: PLAYERS WHO SUIT MUDS
    - (Optional) SFX

 * Size
-    - Regular sprite 'height': 40 px
+    - Regular sprite 'height' (hitbox height) : 40 px
        - Apparent height may vary


@@ -160,6 +160,4 @@ HEARTS, CLUBS, DIAMONDS, SPADES: PLAYERS WHO SUIT MUDS

 * Colour: 4096 colours (12-bit 0x000 - 0xFFF)

-* Height variation option (.85 - .90 - .95 - 1 - 1.05 - 1.10 - 1.15)
-
 * Base mass: 60 kg
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Landholder.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Landholder.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Luminous.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Luminous.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase$1.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase$1.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/NPCIntelligentBase.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PBFSigrid.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PBFSigrid.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/TestNPC$1.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/TestNPC$1.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/TestNPC.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/TestNPC.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Authenticator.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/Authenticator.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandInterpreter.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandInterpreter.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetAV.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetAV.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetLocale.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetLocale.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/GameController.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameControl/GameController.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/GameMap.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/GameMap.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MISC_FEATURES
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MISC_FEATURES
@@ -1,4 +1,4 @@
 * Drawing

 - Players can create their own décors (hang on wall), dresses.
- Two looms (3-3-2 colour mode, 4096 colour mode)
+- Two looms (216 colour mode, 4096 colour mode)
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/LightmapLantern.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/LightmapLantern.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapCamera.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapCamera.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/MapGenerator.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapGenerator/MapGenerator.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Terrarum.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Terrarum.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileProp.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileProp.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TilePropCodex.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TilePropCodex.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/propdata.csv
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/propdata.csv
@@ -1,46 +1,46 @@
 "id";"name"                     ;"opacity";"strength";"fluid";"viscosity";"solid";"wall";"lumcolor";"drop";"fall";"friction"
 # Friction: 0: frictionless, <16: slippery, 16: regular, >16: sticky
-  "0";"TILE_AIR"                 ;      "4";       "0";    "0";      "N/A";    "0";   "0";       "0";   "0";   "0";"16"
-  "1";"TILE_STONE"               ;     "32";      "25";    "0";      "N/A";    "1";   "1";       "0";   "1";   "0";"16"
-  "2";"TILE_DIRT"                ;     "32";       "6";    "0";      "N/A";    "1";   "1";       "0";   "2";   "0";"16"
-  "3";"TILE_GRASS"               ;     "32";       "6";    "0";      "N/A";    "1";   "1";       "0";   "2";   "0";"16"
-  "4";"TILE_PLANK_NORMAL"        ;     "32";      "12";    "0";      "N/A";    "1";   "1";       "0";   "4";   "0";"16"
-  "5";"TILE_PLANK_EBONY"         ;     "32";      "12";    "0";      "N/A";    "1";   "1";       "0";   "5";   "0";"16"
-  "6";"TILE_PLANK_BIRCH"         ;     "32";      "12";    "0";      "N/A";    "1";   "1";       "0";   "6";   "0";"16"
-  "7";"TILE_PLANK_BLOODROSE"     ;     "32";      "12";    "0";      "N/A";    "1";   "1";       "0";   "7";   "0";"16"
-  "8";"TILE_TRUNK_NORMAL"        ;     "32";      "12";    "0";      "N/A";    "1";   "0";       "0";   "8";   "0";"16"
-  "9";"TILE_TRUNK_EBONY"         ;     "32";      "12";    "0";      "N/A";    "1";   "0";       "0";   "9";   "0";"16"
- "10";"TILE_TRUNK_BIRCH"         ;     "32";      "12";    "0";      "N/A";    "1";   "0";       "0";  "10";   "0";"16"
- "11";"TILE_TRUNK_BLOODROSE"     ;     "32";      "12";    "0";      "N/A";    "1";   "0";       "0";  "11";   "0";"16"
- "12";"TILE_STONE"               ;     "32";      "25";    "0";      "N/A";    "1";   "1";       "0";  "12";   "0";"16"
- "13";"TILE_SAND"                ;     "32";       "6";    "0";      "N/A";    "1";   "1";       "0";  "13";   "1";"16"
- "14";"TILE_GRAVEL"              ;     "32";       "6";    "0";      "N/A";    "1";   "0";       "0";  "14";   "1";"16"
+  "0";"TILE_AIR"                 ;      "1";       "0";    "0";      "N/A";    "0";   "0";    "0";   "0";   "0";"16"
+  "1";"TILE_STONE"               ;      "5";      "25";    "0";      "N/A";    "1";   "1";    "0";   "1";   "0";"16"
+  "2";"TILE_DIRT"                ;      "5";       "6";    "0";      "N/A";    "1";   "1";    "0";   "2";   "0";"16"
+  "3";"TILE_GRASS"               ;      "5";       "6";    "0";      "N/A";    "1";   "1";    "0";   "2";   "0";"16"
+  "4";"TILE_PLANK_NORMAL"        ;      "5";      "12";    "0";      "N/A";    "1";   "1";    "0";   "4";   "0";"16"
+  "5";"TILE_PLANK_EBONY"         ;      "5";      "12";    "0";      "N/A";    "1";   "1";    "0";   "5";   "0";"16"
+  "6";"TILE_PLANK_BIRCH"         ;      "5";      "12";    "0";      "N/A";    "1";   "1";    "0";   "6";   "0";"16"
+  "7";"TILE_PLANK_BLOODROSE"     ;      "5";      "12";    "0";      "N/A";    "1";   "1";    "0";   "7";   "0";"16"
+  "8";"TILE_TRUNK_NORMAL"        ;      "5";      "12";    "0";      "N/A";    "1";   "0";    "0";   "8";   "0";"16"
+  "9";"TILE_TRUNK_EBONY"         ;      "5";      "12";    "0";      "N/A";    "1";   "0";    "0";   "9";   "0";"16"
+ "10";"TILE_TRUNK_BIRCH"         ;      "5";      "12";    "0";      "N/A";    "1";   "0";    "0";  "10";   "0";"16"
+ "11";"TILE_TRUNK_BLOODROSE"     ;      "5";      "12";    "0";      "N/A";    "1";   "0";    "0";  "11";   "0";"16"
+ "12";"TILE_STONE"               ;      "5";      "25";    "0";      "N/A";    "1";   "1";    "0";  "12";   "0";"16"
+ "13";"TILE_SAND"                ;      "5";       "6";    "0";      "N/A";    "1";   "1";    "0";  "13";   "1";"16"
+ "14";"TILE_GRAVEL"              ;      "5";       "6";    "0";      "N/A";    "1";   "0";    "0";  "14";   "1";"16"

- "15";"TILE_ORE_MALACHITE"       ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "15";   "0";"16"
- "16";"TILE_ORE_HEMATITE"        ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "16";   "0";"16"
- "17";"TILE_ORE_NATURAL_GOLD"    ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "17";   "0";"16"
- "18";"TILE_ORE_NATURAL_SILVER"  ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "18";   "0";"16"
- "19";"TILE_ORE_RUTILE"          ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "19";   "0";"16"
- "20";"TILE_ORE_AURICHALCUMITE"  ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "20";   "0";"16"
- "21";"TILE_GEM_RUBY"            ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "21";   "0";"16"
- "22";"TILE_GEM_EMERALD"         ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "22";   "0";"16"
- "23";"TILE_GEM_SAPPHIRE"        ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "23";   "0";"16"
- "24";"TILE_GEM_TOPAZ"           ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "24";   "0";"16"
- "25";"TILE_GEM_DIAMOND"         ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "25";   "0";"16"
- "26";"TILE_GEM_AMETHYST"        ;     "32";      "25";    "0";      "N/A";    "1";   "0";       "0";  "26";   "0";"16"
+ "15";"TILE_ORE_MALACHITE"       ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "15";   "0";"16"
+ "16";"TILE_ORE_HEMATITE"        ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "16";   "0";"16"
+ "17";"TILE_ORE_NATURAL_GOLD"    ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "17";   "0";"16"
+ "18";"TILE_ORE_NATURAL_SILVER"  ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "18";   "0";"16"
+ "19";"TILE_ORE_RUTILE"          ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "19";   "0";"16"
+ "20";"TILE_ORE_AURICHALCUMITE"  ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "20";   "0";"16"
+ "21";"TILE_GEM_RUBY"            ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "21";   "0";"16"
+ "22";"TILE_GEM_EMERALD"         ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "22";   "0";"16"
+ "23";"TILE_GEM_SAPPHIRE"        ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "23";   "0";"16"
+ "24";"TILE_GEM_TOPAZ"           ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "24";   "0";"16"
+ "25";"TILE_GEM_DIAMOND"         ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "25";   "0";"16"
+ "26";"TILE_GEM_AMETHYST"        ;      "5";      "25";    "0";      "N/A";    "1";   "0";    "0";  "26";   "0";"16"

- "27";"TILE_SNOW"                ;     "32";       "6";    "0";      "N/A";    "1";   "1";       "0";  "27";   "0";"16"
- "28";"TILE_ICE_FRAGILE"         ;      "8";       "1";    "0";      "N/A";    "1";   "0";       "0";  "28";   "0";"16"
- "29";"TILE_ICE_NATURAL"         ;     "24";      "25";    "0";      "N/A";    "1";   "1";       "0";  "29";   "0"; "8"
- "30";"TILE_ICE_CLEAR_MAGICAL"   ;     "32";      "25";    "0";      "N/A";    "1";   "1";  "855567";  "30";   "0"; "8"
+ "27";"TILE_SNOW"                ;      "5";       "6";    "0";      "N/A";    "1";   "1";    "0";  "27";   "0";"16"
+ "28";"TILE_ICE_FRAGILE"         ;      "2";       "1";    "0";      "N/A";    "1";   "0";    "0";  "28";   "0";"16"
+ "29";"TILE_ICE_NATURAL"         ;      "4";      "25";    "0";      "N/A";    "1";   "1";    "0";  "29";   "0"; "8"
+ "30";"TILE_ICE_CLEAR_MAGICAL"   ;      "5";      "25";    "0";      "N/A";    "1";   "1"; "4967";  "30";   "0"; "8"
 # see scandinavian name set female of this tile id!
- "31";"TILE_PLATFORM_STONE"      ;      "2";       "0";    "0";      "N/A";    "0";   "0";       "0";  "31";   "0";"16"
- "32";"TILE_PLATFORM_WOODEN"     ;      "2";       "0";    "0";      "N/A";    "0";   "0";       "0";  "32";   "0";"16"
- "33";"TILE_PLATFORM_EBONY"      ;      "2";       "0";    "0";      "N/A";    "0";   "0";       "0";  "33";   "0";"16"
- "34";"TILE_PLATFORM_BIRCH"      ;      "2";       "0";    "0";      "N/A";    "0";   "0";       "0";  "34";   "0";"16"
- "35";"TILE_PLATFORM_BLOODROSE"  ;      "2";       "0";    "0";      "N/A";    "0";   "0";       "0";  "35";   "0";"16"
+ "31";"TILE_PLATFORM_STONE"      ;      "0";       "0";    "0";      "N/A";    "0";   "0";    "0";  "31";   "0";"16"
+ "32";"TILE_PLATFORM_WOODEN"     ;      "0";       "0";    "0";      "N/A";    "0";   "0";    "0";  "32";   "0";"16"
+ "33";"TILE_PLATFORM_EBONY"      ;      "0";       "0";    "0";      "N/A";    "0";   "0";    "0";  "33";   "0";"16"
+ "34";"TILE_PLATFORM_BIRCH"      ;      "0";       "0";    "0";      "N/A";    "0";   "0";    "0";  "34";   "0";"16"
+ "35";"TILE_PLATFORM_BLOODROSE"  ;      "0";       "0";    "0";      "N/A";    "0";   "0";    "0";  "35";   "0";"16"

- "36";"TILE_TORCH"               ;      "0";       "0";    "0";      "N/A";    "0";   "0";"16769997";  "36";   "0";"16"
+ "36";"TILE_TORCH"               ;      "0";       "0";    "0";      "N/A";    "0";   "0";"63680";  "36";   "0";"16"

-"239";"TILE_WATER"               ;     "16";     "100";    "1";        "2";    "0";   "0";"15464447"; "239";   "0";"16"
-"255";"TILE_LAVA"                ;      "0";     "100";    "1";        "2";    "0";   "0"; "8397312"; "239";   "0";"16"
+"239";"TILE_WATER"               ;      "2";     "100";    "1";        "2";    "0";   "0";"59159"; "239";   "0";"16"
+"255";"TILE_LAVA"                ;      "0";     "100";    "1";        "2";    "0";   "0";"48320"; "239";   "0";"16"
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.class
--- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/ConsoleWindow.class
+++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/ConsoleWindow.class