X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Fg_language.pas;h=405798e96f12086e981d26355fa78f9ad2a4fcde;hb=1fb1b203de2d204939df9112dda1f72760c956ee;hp=7a9b194002a0a0f1ca487f542dc44d0307b509be;hpb=c3be56f2a3849cd22be39ce594498c7990e05606;p=d2df-editor.git

diff --git a/src/editor/g_language.pas b/src/editor/g_language.pas
index 7a9b194..405798e 100644
--- a/src/editor/g_language.pas
+++ b/src/editor/g_language.pas
@@ -62,6 +62,7 @@ Type
     I_ARRAY_ITEM_PLASMA_RIFLE,
     I_ARRAY_ITEM_BFG,
     I_ARRAY_ITEM_SUPER_MINIGUN,
+    I_ARRAY_ITEM_FLAMETHROWER,
     I_ARRAY_ITEM_CLIP,
     I_ARRAY_ITEM_AMMO_BOX,
     I_ARRAY_ITEM_4_SHELLS,
@@ -70,6 +71,7 @@ Type
     I_ARRAY_ITEM_ROCKET_BOX,
     I_ARRAY_ITEM_CELL,
     I_ARRAY_ITEM_LARGE_CELL,
+    I_ARRAY_ITEM_FUELCAN,
     I_ARRAY_ITEM_BACKPACK,
     I_ARRAY_ITEM_KEY_RED,
     I_ARRAY_ITEM_KEY_GREEN,
@@ -244,7 +246,11 @@ Type
     I_PROP_TR_SHOT_TO_4,
     I_PROP_TR_SHOT_TO_5,
     I_PROP_TR_SHOT_TO_6,
-    I_PROP_TR_SHOT_ALLMAP,
+    I_PROP_TR_SHOT_AIM,
+    I_PROP_TR_SHOT_AIM_0,
+    I_PROP_TR_SHOT_AIM_1,
+    I_PROP_TR_SHOT_AIM_2,
+    I_PROP_TR_SHOT_AIM_3,
     I_PROP_TR_SHOT_AMMO,
     I_PROP_TR_SHOT_RELOAD,
     I_PROP_TR_SHOT_SIGHT,
@@ -733,6 +739,8 @@ Const
                                        'BFG9000'),
     ('ARRAY ITEM SUPER MINIGUN',       'Super Chaingun',
                                        'Суперпулемёт'),
+    ('ARRAY ITEM FLAMETHROWER',        'Flamethrower',
+                                       'Огнемёт'),
     ('ARRAY ITEM CLIP',                'Clip',
                                        'Патроны'),
     ('ARRAY ITEM AMMO BOX',            'Box of Bullets',
@@ -749,6 +757,8 @@ Const
                                        'Батарейка'),
     ('ARRAY ITEM LARGE CELL',          'Energy Cell Pack',
                                        'Батарея'),
+    ('ARRAY ITEM FUELCAN',             'Fuel Canister',
+                                       'Канистра'),
     ('ARRAY ITEM BACKPACK',            'Backpack',
                                        'Рюкзак'),
     ('ARRAY ITEM KEY RED',             'Red Key',
@@ -1091,8 +1101,16 @@ Const
                                        'Монстры, игроки'),
     ('PROP TR SHOT TO 6',              'Players, monsters',
                                        'Игроки, монстры'),
-    ('PROP TR SHOT ALLMAP',            'On entire map',
+    ('PROP TR SHOT AIM',               'Auto-aiming mode',
+                                       'Режим автонаведения'),
+    ('PROP TR SHOT AIM 0',             'Trigger area',
+                                       'Область триггера'),
+    ('PROP TR SHOT AIM 1',             'Entire map',
                                        'По всей карте'),
+    ('PROP TR SHOT AIM 2',             'Trace trigger area',
+                                       'Область триггера с трассировкой'),
+    ('PROP TR SHOT AIM 3',             'Trace entire map',
+                                       'Вся карта с трассировкой'),
     ('PROP TR SHOT AMMO',              'Ammo limit',
                                        'Кол-во патронов'),
     ('PROP TR SHOT RELOAD',            'Reload interval (in ticks)',
@@ -1820,6 +1838,7 @@ begin
   ItemNames[ITEM_WEAPON_PLASMA] := _lc[I_ARRAY_ITEM_PLASMA_RIFLE];
   ItemNames[ITEM_WEAPON_BFG] := _lc[I_ARRAY_ITEM_BFG];
   ItemNames[ITEM_WEAPON_SUPERPULEMET] := _lc[I_ARRAY_ITEM_SUPER_MINIGUN];
+  ItemNames[ITEM_WEAPON_FLAMETHROWER] := _lc[I_ARRAY_ITEM_FLAMETHROWER];
   ItemNames[ITEM_AMMO_BULLETS] := _lc[I_ARRAY_ITEM_CLIP];
   ItemNames[ITEM_AMMO_BULLETS_BOX] := _lc[I_ARRAY_ITEM_AMMO_BOX];
   ItemNames[ITEM_AMMO_SHELLS] := _lc[I_ARRAY_ITEM_4_SHELLS];
@@ -1828,6 +1847,7 @@ begin
   ItemNames[ITEM_AMMO_ROCKET_BOX] := _lc[I_ARRAY_ITEM_ROCKET_BOX];
   ItemNames[ITEM_AMMO_CELL] := _lc[I_ARRAY_ITEM_CELL];
   ItemNames[ITEM_AMMO_CELL_BIG] := _lc[I_ARRAY_ITEM_LARGE_CELL];
+  ItemNames[ITEM_AMMO_FUELCAN] := _lc[I_ARRAY_ITEM_FUELCAN];
   ItemNames[ITEM_AMMO_BACKPACK] := _lc[I_ARRAY_ITEM_BACKPACK];
   ItemNames[ITEM_KEY_RED] := _lc[I_ARRAY_ITEM_KEY_RED];
   ItemNames[ITEM_KEY_GREEN] := _lc[I_ARRAY_ITEM_KEY_GREEN];
@@ -1933,6 +1953,8 @@ begin
     lbItemList.Items.Add(ItemNames[ITEM_HELMET]);
     lbItemList.Items.Add(ItemNames[ITEM_JETPACK]);
     lbItemList.Items.Add(ItemNames[ITEM_INVIS]);
+    lbItemList.Items.Add(ItemNames[ITEM_WEAPON_FLAMETHROWER]);
+    lbItemList.Items.Add(ItemNames[ITEM_AMMO_FUELCAN]);
 
     lbMonsterList.Clear();
     for i := MONSTER_DEMON to MONSTER_MAN do