X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Fg_language.pas;h=029ef181c9bbd5ca73a33c9787e3b640b99e9aa3;hb=aac9a5a0163636f33249acf6ce27ea770818c6cb;hp=b6a779d66be54d6d0f92060bbc4a7bfca8639e7d;hpb=a63da3daf94fdf69679133869733e44f97751c5c;p=d2df-editor.git

diff --git a/src/editor/g_language.pas b/src/editor/g_language.pas
index b6a779d..029ef18 100644
--- a/src/editor/g_language.pas
+++ b/src/editor/g_language.pas
@@ -96,6 +96,7 @@ Type
     I_ARRAY_SHOT_BFG,
     I_ARRAY_SHOT_EXPL,
     I_ARRAY_SHOT_BFGEXPL,
+    I_ARRAY_SHOT_FLAME,
 
     I_ARRAY_MON_DEMON,
     I_ARRAY_MON_IMP,
@@ -233,6 +234,14 @@ Type
     I_PROP_TR_SCORE_CON,
     I_PROP_TR_SCORE_MSG,
     I_PROP_TR_DAMAGE_VALUE,
+    I_PROP_TR_DAMAGE_KIND,
+    I_PROP_TR_DAMAGE_KIND_0,
+    I_PROP_TR_DAMAGE_KIND_3,
+    I_PROP_TR_DAMAGE_KIND_4,
+    I_PROP_TR_DAMAGE_KIND_5,
+    I_PROP_TR_DAMAGE_KIND_6,
+    I_PROP_TR_DAMAGE_KIND_7,
+    I_PROP_TR_DAMAGE_KIND_8,
     I_PROP_TR_HEALTH_MAX,
     I_PROP_TR_SHOT_TYPE,
     I_PROP_TR_SHOT_SOUND,
@@ -418,6 +427,7 @@ Type
     I_CAP_REMOVE,
     I_CAP_TEXTURE,
     I_CAP_ANIMATION,
+    I_CAP_STAT_SELECTED,
 
     I_CTRL_PROP_KEY,
     I_CTRL_PROP_VALUE,
@@ -532,6 +542,7 @@ Type
     I_LAB_LAUNCH_SECS,
     I_LAB_LAUNCH_SCORE,
     I_LAB_LAUNCH_PATH,
+    I_LAB_LAUNCH_ARGS,
 
     I_LAB_ES_GRID,
     I_LAB_ES_GRID_COLOR,
@@ -541,6 +552,8 @@ Type
     I_LAB_ES_MINIMAP,
     I_LAB_ES_RECENT,
     I_LAB_ES_LANGUAGE,
+    I_LAB_ES_COMPRESS,
+    I_LAB_ES_BACKUP,
 
     I_LAB_PACK_SAVE_TO,
     I_LAB_PACK_MAP_NAME,
@@ -644,7 +657,7 @@ Uses
   SysUtils, e_log, f_main, f_about, f_activationtype,
   f_addresource_sky, f_addresource_sound,
   f_addresource_texture, f_choosetype, f_keys, f_mapcheck,
-  f_mapoptions, f_maptest, f_mapoptimization, f_options,
+  f_mapoptions, f_mapoptimization, f_options,
   f_packmap, f_savemap, f_saveminimap, f_selectmap, Forms, utils;
 
 Const
@@ -816,6 +829,8 @@ Const
                                        'Взрыв'),
     ('ARRAY SHOT BFGEXPL',             'BFG explosion',
                                        'Взрыв BFG'),
+    ('ARRAY SHOT FLAME',               'Flame',
+                                       'Огонь'),
 
     ('ARRAY MON DEMON',                'Pinky',
                                        'Демон'),
@@ -1085,6 +1100,22 @@ Const
                                        'Сообщение в игру'),
     ('PROP TR DAMAGE VALUE',           'Damage',
                                        'Ущерб'),
+    ('PROP TR DAMAGE KIND',            'Damage type',
+                                       'Тип урона'),
+    ('PROP TR DAMAGE KIND 0',          'HIT_SOME',
+                                       'HIT_SOME'),
+    ('PROP TR DAMAGE KIND 3',          'HIT_TRAP',
+                                       'HIT_TRAP'),
+    ('PROP TR DAMAGE KIND 4',          'HIT_FALL',
+                                       'HIT_FALL'),
+    ('PROP TR DAMAGE KIND 5',          'HIT_WATER',
+                                       'HIT_WATER'),
+    ('PROP TR DAMAGE KIND 6',          'HIT_ACID',
+                                       'HIT_ACID'),
+    ('PROP TR DAMAGE KIND 7',          'HIT_ELECTRO',
+                                       'HIT_ELECTRO'),
+    ('PROP TR DAMAGE KIND 8',          'HIT_FLAME',
+                                       'HIT_FLAME'),
     ('PROP TR HEALTH MAX',             'To maximum',
                                        'До максимума'),
     ('PROP TR SHOT TYPE',              'Projectile',
@@ -1443,6 +1474,8 @@ Const
                                        'Текстура: %dx%d'),
     ('CAP ANIMATION',                  'Animation: %dx%d, %d frames',
                                        'Анимация: %dx%d, %d кадров'),
+    ('CAP STAT SELECTED',              'Selected objects: %d',
+                                       'Выделено объектов: %d'),
 
     ('CTRL PROP KEY',                  'Property',
                                        'Свойство'),
@@ -1655,6 +1688,8 @@ Const
                                        'Лимит очков:'),
     ('LAB LAUNCH PATH',                'Path to Doom2DF.exe:',
                                        'Путь к Doom2DF.exe:'),
+    ('LAB LAUNCH ARGS',                'Launch Arguments:',
+                                       'Параметры запуска:'),
 
     ('LAB ES GRID',                    'Grid Step:',
                                        'Шаг сетки:'),
@@ -1672,6 +1707,10 @@ Const
                                        'Запоминать последних открытых карт:'),
     ('LAB ES LANGUAGE',                'Language:',
                                        'Язык:'),
+    ('LAB ES COMPRESS',                'Compress archive when save',
+                                       'Сжимать архив при сохранении'),
+    ('LAB ES BACKUP',                  'Make backup before save',
+                                       'Резервная копия при сохранении'),
 
     ('LAB PACK SAVE TO',               'Save to:',
                                        'Сохранить в:'),
@@ -1790,10 +1829,10 @@ Const
     ('WAD SPECIAL TEXS',               '<EXTRA TEXTURES>',
                                        '<СПЕЦТЕКСТУРЫ>'),
 
-    ('FILE FILTER ALL',                'Doom 2D: Forever Maps (*.wad)|*.wad|Old Doom 2D: Forever 0.30 Maps (*.ini)|*.ini|All Files (*.*)|*.*',
-                                       'Карты Doom 2D: Forever (*.wad)|*.wad|Старые карты Doom 2D: Forever 0.30 (*.ini)|*.ini|Все файлы (*.*)|*.*'),
-    ('FILE FILTER WAD',                'Doom 2D: Forever Maps (*.wad)|*.wad|All Files (*.*)|*.*',
-                                       'Карты Doom 2D: Forever (*.wad)|*.wad|Все файлы (*.*)|*.*'),
+    ('FILE FILTER ALL',                'Doom 2D: Forever Maps (*.dfz, *.dfzip, *.zip, *.wad)|*.dfz;*.dfzip;*.zip;*.wad|Doom 2D: Forever 0.30 Maps (*.ini)|*.ini|All Files (*.*)|*.*',
+                                       'Карты Doom 2D: Forever (*.dfz, *.dfzip, *.zip, *.wad)|*.dfz;*.dfzip;*.zip;*.wad|Старые карты Doom 2D: Forever 0.30 (*.ini)|*.ini|Все файлы (*.*)|*.*'),
+    ('FILE FILTER WAD',                'Doom 2D: Forever Maps (*.dfz)|*.dfz|Doom 2D: Forever Maps (*.dfzip)|*.dfzip|Doom 2D: Forever Maps (*.zip)|*.zip|Doom 2D: Forever Maps (*.wad)|*.wad|All Files (*.*)|*.*',
+                                       'Карты Doom 2D: Forever (*.dfz)|*.dfz|Карты Doom 2D: Forever (*.dfzip)|*.dfzip|Карты Doom 2D: Forever (*.zip)|*.zip|Карты Doom 2D: Forever (*.wad)|*.wad|Все файлы (*.*)|*.*'),
 
     ('EDITOR TITLE',                   'Doom 2D: Forever Map Editor',
                                        'Редактор карт Doom 2D: Forever'),
@@ -1905,6 +1944,7 @@ begin
   ShotNames[TRIGGER_SHOT_BFG] := _lc[I_ARRAY_SHOT_BFG];
   ShotNames[TRIGGER_SHOT_EXPL] := _lc[I_ARRAY_SHOT_EXPL];
   ShotNames[TRIGGER_SHOT_BFGEXPL] := _lc[I_ARRAY_SHOT_BFGEXPL];
+  ShotNames[TRIGGER_SHOT_FLAME] := _lc[I_ARRAY_SHOT_FLAME];
 
 // Названия монстров:
   MonsterNames[MONSTER_DEMON] := _lc[I_ARRAY_MON_DEMON];
@@ -2016,15 +2056,16 @@ begin
 end;
 
 procedure SetupCaptions();
-var
-  i: Integer;
-
+  var i: Integer; s: AnsiString;
 begin
 // Главная форма:
   with MainForm do
   begin
   // Заголовок:
-    FormCaption := _lc[I_EDITOR_TITLE];
+    s := g_GetBuildHash(false);
+    if s = 'custom build' then
+      s := s + ' by ' + g_GetBuilderName() + ' ' + EDITOR_BUILDDATE + ' ' + EDITOR_BUILDTIME;
+    FormCaption := _lc[I_EDITOR_TITLE] + ' (' + s + ')';
     i := Pos('-', Caption);
     if i > 0 then
       begin
@@ -2080,7 +2121,6 @@ begin
     miMenuSettings.Caption := _lc[I_MENU_SETS];
     miMapOptions.Caption := _lc[I_MENU_SETS_MAP];
     miOptions.Caption := _lc[I_MENU_SETS_EDITOR];
-    miMapTestSettings.Caption := _lc[I_MENU_SETS_LAUNCH];
   // "Справка":
     miMenuHelp.Caption := _lc[I_MENU_HELP];
     miAbout.Caption := _lc[I_MENU_HELP_ABOUT];
@@ -2105,8 +2145,6 @@ begin
     miLayerP7.Caption := _lc[I_MENU_LAYER_MONSTER];
     miLayerP8.Caption := _lc[I_MENU_LAYER_AREA];
     miLayerP9.Caption := _lc[I_MENU_LAYER_TRIGGER];
-  // Всплывающее меню для кнопки теста карты:
-    miMapTestPMSet.Caption := _lc[I_MENU_LAUNCH_SETS];
 
   // Кнопка применения свойств:
     bApplyProperty.Caption := _lc[I_BTN_APPLY_PROPS];
@@ -2286,18 +2324,33 @@ begin
     bCancel.Caption := _lc[I_BTN_CANCEL];
   end;
 
-// Форма "Настройки теста карты":
-  with MapTestForm do
+// From "Editor settings":
+  with OptionsForm do
   begin
-    Caption := _lc[I_CAP_LAUNCH];
+    Caption := _lc[I_CAP_ES];
     bOK.Caption := _lc[I_BTN_OK];
     bCancel.Caption := _lc[I_BTN_CANCEL];
-  // Режим игры:
+  // TabGeneral:
+    cbShowDots.Caption := _lc[I_CTRL_ES_GRID];
+    cbShowTexture.Caption := _lc[I_CTRL_ES_TEXTURE];
+    cbShowSize.Caption := _lc[I_CTRL_ES_PANEL_SIZE];
+    cbCheckerboard.Caption := _lc[I_CTRL_ES_CHECKERBOARD];
+    LabelGrid.Caption := _lc[I_LAB_ES_GRID];
+    LabelGridCol.Caption := _lc[I_LAB_ES_GRID_COLOR];
+    LabelGridSize.Caption := _lc[I_LAB_ES_GRID_SIZE];
+    LabelBack.Caption := _lc[I_LAB_ES_BACK];
+    LabelPreview.Caption := _lc[I_LAB_ES_PREVIEW];
+    LabelMinimap.Caption := _lc[I_LAB_ES_MINIMAP];
+    LabelLanguage.Caption := _lc[I_LAB_ES_LANGUAGE];
+  // TabFiles:
+    cbCompress.Caption := _lc[I_LAB_ES_COMPRESS];
+    cbBackup.Caption := _lc[I_LAB_ES_BACKUP];
+    LabelRecent.Caption := _lc[I_LAB_ES_RECENT];
+  // TabTesting:
     rbDM.Caption := _lc[I_CTRL_LAUNCH_DM];
     rbTDM.Caption := _lc[I_CTRL_LAUNCH_TDM];
     rbCTF.Caption := _lc[I_CTRL_LAUNCH_CTF];
     rbCOOP.Caption := _lc[I_CTRL_LAUNCH_COOP];
-  // Опции:
     cbTwoPlayers.Caption := _lc[I_CTRL_LAUNCH_2P];
     cbTeamDamage.Caption := _lc[I_CTRL_LAUNCH_FF];
     cbAllowExit.Caption := _lc[I_CTRL_LAUNCH_EXIT];
@@ -2307,30 +2360,9 @@ begin
     LabelTime.Caption := _lc[I_LAB_LAUNCH_TIME];
     LabelSecs.Caption := _lc[I_LAB_LAUNCH_SECS];
     LabelScore.Caption := _lc[I_LAB_LAUNCH_SCORE];
-  // Путь:
     LabelPath.Caption := _lc[I_LAB_LAUNCH_PATH];
     FindD2dDialog.Title := _lc[I_CTRL_LAUNCH_OPEN];
-  end;
-
-// Форма "Настройки редактора":
-  with OptionsForm do
-  begin
-    Caption := _lc[I_CAP_ES];
-    bOK.Caption := _lc[I_BTN_OK];
-    bCancel.Caption := _lc[I_BTN_CANCEL];
-  // Настройки:
-    cbShowDots.Caption := _lc[I_CTRL_ES_GRID];
-    cbShowTexture.Caption := _lc[I_CTRL_ES_TEXTURE];
-    cbShowSize.Caption := _lc[I_CTRL_ES_PANEL_SIZE];
-    cbCheckerboard.Caption := _lc[I_CTRL_ES_CHECKERBOARD];
-    LabelGrid.Caption := _lc[I_LAB_ES_GRID];
-    LabelGridCol.Caption := _lc[I_LAB_ES_GRID_COLOR];
-    LabelGridSize.Caption := _lc[I_LAB_ES_GRID_SIZE];
-    LabelBack.Caption := _lc[I_LAB_ES_BACK];
-    LabelPreview.Caption := _lc[I_LAB_ES_PREVIEW];
-    LabelMinimap.Caption := _lc[I_LAB_ES_MINIMAP];
-    LabelRecent.Caption := _lc[I_LAB_ES_RECENT];
-    LabelLanguage.Caption := _lc[I_LAB_ES_LANGUAGE];
+    LabelArgs.Caption := _lc[I_LAB_LAUNCH_ARGS];
   end;
 
 // Форма "Упаковать карту":