OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

thief: Commit


Commit MetaInfo

Revision36 (tree)
Time2012-01-21 00:55:49
Authorseussnu

Log Message

0.0.8-alpha1
・ 言語処理を修正

Change Summary

Incremental Difference

--- thief.js (revision 35)
+++ thief.js (revision 36)
@@ -32,7 +32,6 @@
3232 var THIEF = {
3333 conf : {
3434 id : 'Thief', // was used "HTML's id", and "System tag".
35- fontFace : 'monospace, sans-serif',
3635 textColor : '#FFFFFF',
3736 emTextColor : '#FF0000',
3837 bgColor : '#000000',
@@ -40,9 +39,7 @@
4039 gridStyle : '0px none #888888', // css td border options
4140 mapWidth : 60,
4241 mapHeight : 20,
43- mapDepth : 256,
44- language : null,
45- languagePriolity : ['en', 'ja'],
42+ languagePriolity : ['AUTO', 'en', 'ja'],
4643 statusPosition : 'bottom', // top or bottom
4744 statusLineFormat : [
4845 '${THIEF.global.actDG.%get@name%}:${THIEF.global.actDG.nowLV}' +
@@ -57,8 +54,7 @@
5754 ' APP:${THIEF.global.adventurer.%get@app%}' +
5855 ' SAN:${THIEF.global.adventurer.%get@san%}' +
5956 ' AC:${THIEF.global.adventurer.%get@armorPoint%}',
60- 'Lang:${THIEF.conf.language}' +
61- ' Turn:${THIEF.global.turn}' +
57+ 'Turn:${THIEF.global.turn}' +
6258 ' CT:${THIEF.global.adventurer.%get@ct%}'
6359 ],
6460 messagePosition : 'top', // top or bottom
@@ -68,7 +64,7 @@
6864 mainWindowPosition : 'left', // css float option (left, right, none)
6965 msgOverflow : 'hidden', // css overflow option (visible, scroll, hidden, auto)
7066 itemSort : ['$', '"', ']', '[', '%', '!', '?', '+', '=', '/', '(', ')', '*' ],
71- debugmode : false
67+ debugmode : true
7268 },
7369
7470 global : {
@@ -327,27 +323,22 @@
327323 THIEF.func.method.get = function (param) {
328324 var val;
329325
330- if (THIEF.global.debugmode) {
331- if (typeof param === 'undefined') {
332- alert('引数が指定されていません');
333- }
326+ switch (typeof this[param]) {
327+ case 'number':
328+ case 'boolean':
329+ val = this[param];
330+ break;
331+ case 'object':
332+ case 'string':
333+ val = THIEF.util.getText(this[param]);
334+ break;
335+ case 'function':
336+ val = this[param]();
337+ break;
338+ default:
339+ break;
334340 }
335341
336- if (typeof this[param] === 'function') {
337- val = this[param]();
338- } else if (this[param]) {
339- if (this[param][THIEF.conf.language]) {
340- val = this[param][THIEF.conf.language];
341- } else {
342- val = this[param];
343- for (var i = 0; i < THIEF.conf.languagePriolity.length; i++) {
344- if (this[param][THIEF.conf.languagePriolity[i]]) {
345- val = this[param][THIEF.conf.languagePriolity[i]];
346- break;
347- }
348- }
349- }
350- }
351342 return val;
352343 };
353344
@@ -1554,13 +1545,6 @@
15541545
15551546 THIEF.html.addDebugMessage('<em>初期化（ターン0）を開始</em>...');
15561547
1557- // ブラウザ言語の取得
1558- THIEF.conf.language = (THIEF.conf.language // || navigator.browserLanguage
1559- || navigator.language
1560- || navigator.userLanguage).substr(0, 2);
1561-
1562- //THIEF.conf.language = 'en';
1563-
15641548 // シナリオの読み込み
15651549 THIEF.util.loadScenario();
15661550
@@ -1937,7 +1921,6 @@
19371921 };
19381922 }();
19391923
1940-// TODO
19411924 THIEF.util.loadScenario = function () {
19421925 THIEF.html.addDebugMessage('シナリオ読み込み開始...');
19431926 THIEF.util.createDungeon(THIEF.Data.Scenario[THIEF.Data.Scenario.$.root]);
@@ -2782,17 +2765,20 @@
27822765 text = arguments[0];
27832766
27842767 // 言語が複数あれば選択
2785- if (arguments[0][THIEF.conf.language]) {
2786- text = arguments[0][THIEF.conf.language];
2787- THIEF.html.addDebugMessage('言語設定はコンフィグ(' + THIEF.conf.language + ')とする。');
2788- } else {
2789- for (i = 0; i < THIEF.conf.languagePriolity.length; i++) {
2790- if (arguments[0][THIEF.conf.languagePriolity[i]]) {
2791- text = arguments[0][THIEF.conf.languagePriolity[i]];
2792- THIEF.html.addDebugMessage('言語設定は、優先度 ' + i + ' の ' + THIEF.conf.languagePriolity[i] + ' とする。');
2793- break;
2794- }
2768+ for (i = 0; i < THIEF.conf.languagePriolity.length; i++) {
2769+ var lang;
2770+
2771+ if (THIEF.conf.languagePriolity[i] === 'AUTO') {
2772+ lang = (navigator.language || navigator.userLanguage).substr(0, 2);
2773+ } else {
2774+ lang = THIEF.conf.languagePriolity[i];
27952775 }
2776+
2777+ if (arguments[0][lang]) {
2778+ text = arguments[0][lang];
2779+ THIEF.html.addDebugMessage('言語設定は、優先度 ' + i + ' の ' + THIEF.conf.languagePriolity[i] + ' とする。');
2780+ break;
2781+ }
27962782 }
27972783
27982784 // 書式選択
@@ -3091,7 +3077,7 @@
30913077 var dbug = THIEF.conf.id + 'Debug'; // デバッグ情報
30923078 sheet.addStyle('#' + root, 'color', THIEF.conf.textColor);
30933079 sheet.addStyle('#' + root, 'background-color', THIEF.conf.bgColor);
3094- sheet.addStyle('#' + root, 'font-family', THIEF.conf.fontFace);
3080+ sheet.addStyle('#' + root, 'font-family', 'monospace');
30953081 sheet.addStyle('#' + root, 'letter-spacing', '0px');
30963082 sheet.addStyle('#' + root, 'line-height', '1');
30973083 sheet.addStyle('#' + root + ' p', 'margin', '0em');
@@ -4090,7 +4076,7 @@
40904076 startLevel : 2,
40914077 hierarchy : [
40924078 {level : ['First', 'SmallRoom', 'Safety'], base : 2},
4093- {branch : 'SideRoad', base : 3, branchDir : 'down'}
4079+ {branch : 'SideRoad', base : 3, range : 1, branchDir : 'down'}
40944080 //{level : 'BigRoom', base : 4, range :3, chance : 50}
40954081 ]
40964082 },
Show on old repository browser