- Recommit Kaiden's class item cap fix r1790 (lost during meager of Big Maps Project code) & other related variables from INT16 to INT32; increased the class item limit in mapeditor (by Buggler)

- Map Editor: Items - Hotkeys (by Buggler)
o Hotkeys ',': Left Scroll
o Hotkeys '.': Right Scroll
o ('Shift': Jump 1 page; 'Ctrl': Jump 10 pages; 'Ctrl + Shift': Jump to first/last page)
- Changed saveloadscreen previous/next hotkey to ','/'.' due to interference with input_box navigation using arrow keys (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5877 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-02-27 19:06:52 +00:00
parent dfc17ea9c6
commit 834aa1eb13
15 changed files with 242 additions and 63 deletions
+8 -5
View File
@@ -317,6 +317,7 @@ STR16 BoxFilter[] =
STR16 iEditorItemStatsButtonsText[] =
{
L"Delete",
L"Delete item (|D|e|l)",
};
STR16 FaceDirs[8] =
@@ -354,11 +355,11 @@ STR16 iEditorMercsToolbarText[] =
L"Schedule mode",
L"Schedule mode",
L"DELETE",
L"Delete currently selected merc (DEL).",
L"Delete currently selected merc (|D|e|l)",
L"NEXT", //20
L"Find next merc (SPACE).",
L"Find next merc (|S|p|a|c|e)",
L"Toggle priority existance",
L"Toggle whether or not placement has/naccess to all doors.",
L"Toggle whether or not placement has/naccess to all doors",
//Orders
L"STATIONARY",
@@ -463,7 +464,9 @@ STR16 iEditorItemsToolbarText[] =
L"E3",
L"Triggers",
L"Keys",
L"Rnd",
L"Rnd", //10
L"Previous (|,)", // previous page
L"Next (|.)", // next page
};
STR16 iEditorMapInfoToolbarText[] =
@@ -491,7 +494,7 @@ STR16 iEditorOptionsToolbarText[]=
L"Load map",
L"Select tileset",
L"Leave Editor mode",
L"Exit game.",
L"Exit game",
L"Create radar map",
L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",
+8 -5
View File
@@ -318,6 +318,7 @@ STR16 BoxFilter[] =
STR16 iEditorItemStatsButtonsText[] =
{
L"Delete",
L"Delete item (|D|e|l)",
};
STR16 FaceDirs[8] =
@@ -355,11 +356,11 @@ STR16 iEditorMercsToolbarText[] =
L"Schedule mode",
L"Schedule mode",
L"DELETE",
L"Delete currently selected merc (DEL).",
L"Delete currently selected merc (|D|e|l)",
L"NEXT", //20
L"Find next merc (SPACE).",
L"Find next merc (|S|p|a|c|e)",
L"Toggle priority existance",
L"Toggle whether or not placement has/naccess to all doors.",
L"Toggle whether or not placement has/naccess to all doors",
//Orders
L"STATIONARY",
@@ -464,7 +465,9 @@ STR16 iEditorItemsToolbarText[] =
L"E3",
L"Triggers",
L"Keys",
L"Rnd",
L"Rnd", //10
L"Previous (|,)", // previous page
L"Next (|.)", // next page
};
STR16 iEditorMapInfoToolbarText[] =
@@ -492,7 +495,7 @@ STR16 iEditorOptionsToolbarText[]=
L"Load map",
L"Select tileset",
L"Leave Editor mode",
L"Exit game.",
L"Exit game",
L"Create radar map",
L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",
+8 -5
View File
@@ -317,6 +317,7 @@ STR16 BoxFilter[] =
STR16 iEditorItemStatsButtonsText[] =
{
L"Delete",
L"Delete item (|D|e|l)",
};
STR16 FaceDirs[8] =
@@ -354,11 +355,11 @@ STR16 iEditorMercsToolbarText[] =
L"Schedule mode",
L"Schedule mode",
L"DELETE",
L"Delete currently selected merc (DEL).",
L"Delete currently selected merc (|D|e|l)",
L"NEXT", //20
L"Find next merc (SPACE).",
L"Find next merc (|S|p|a|c|e)",
L"Toggle priority existance",
L"Toggle whether or not placement has/naccess to all doors.",
L"Toggle whether or not placement has/naccess to all doors",
//Orders
L"STATIONARY",
@@ -463,7 +464,9 @@ STR16 iEditorItemsToolbarText[] =
L"E3",
L"Triggers",
L"Keys",
L"Rnd",
L"Rnd", //10
L"Previous (|,)", // previous page
L"Next (|.)", // next page
};
STR16 iEditorMapInfoToolbarText[] =
@@ -491,7 +494,7 @@ STR16 iEditorOptionsToolbarText[]=
L"Load map",
L"Select tileset",
L"Leave Editor mode",
L"Exit game.",
L"Exit game",
L"Create radar map",
L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",
+8 -5
View File
@@ -322,6 +322,7 @@ STR16 BoxFilter[] =
STR16 iEditorItemStatsButtonsText[] =
{
L"Supprimer",
L"Article supprimer (|D|e|l)",
};
STR16 FaceDirs[8] =
@@ -359,11 +360,11 @@ STR16 iEditorMercsToolbarText[] =
L"Calendrier mode",
L"Calendrier mode",
L"SUPPRIMER",
L"Supprimer le mercenaire sélectionné (SUPPR).",
L"Supprimer le mercenaire sélectionné (|S|u|p|p|r)",
L"SUIVANT", //20
L"Mercenaire suivant (ESPACE).",
L"Mercenaire suivant (|E|s|p|a|c|e)",
L"Changer l'existance prioritaire",
L"Changer si le placement a/naccès à toutes les portes.",
L"Changer si le placement a/naccès à toutes les portes",
//Orders
L"STATIONNAIRE",
@@ -468,7 +469,9 @@ STR16 iEditorItemsToolbarText[] =
L"E3",
L"Détentes",
L"Clés",
L"Rnd", // TODO.Translate
L"Rnd", //10 // TODO.Translate
L"Précédent (|,)", // previous page
L"Suivant (|.)", // next page
};
STR16 iEditorMapInfoToolbarText[] =
@@ -496,7 +499,7 @@ STR16 iEditorOptionsToolbarText[]=
L"Charger la carte",
L"Sélectionner un tileset",
L"Quitter le mode éditeur",
L"Quitter le jeu.",
L"Quitter le jeu",
L"Créer un carte de radar",
L"Une fois la carte vérifiée, elle sera sauvée sous le format original JA2.\nCette option est seulement valable sur les cartes de taille 'normale' qui ne font pas référence aux nombre de réseaux (ex: réseau de sortie) > 25600.",
L"Une fois la carte vérifiée et chargée, elle sera élargie automatiquement selon les rangées et colonnes choisies.",
+8 -5
View File
@@ -341,6 +341,7 @@ STR16 BoxFilter[] =
STR16 iEditorItemStatsButtonsText[] =
{
L"Delete",
L"Delete item (|D|e|l)",
};
STR16 FaceDirs[8] =
@@ -378,11 +379,11 @@ STR16 iEditorMercsToolbarText[] =
L"Schedule mode",
L"Schedule mode",
L"DELETE",
L"Delete currently selected merc (DEL).",
L"Delete currently selected merc (|D|e|l)",
L"NEXT", //20
L"Find next merc (SPACE).",
L"Find next merc (|S|p|a|c|e)",
L"Toggle priority existance",
L"Toggle whether or not placement has/naccess to all doors.",
L"Toggle whether or not placement has/naccess to all doors",
//Orders
L"STATIONARY",
@@ -487,7 +488,9 @@ STR16 iEditorItemsToolbarText[] =
L"E3",
L"Triggers",
L"Keys",
L"Rnd", // TODO.Translate
L"Rnd", //10
L"Previous (|,)", // previous page
L"Next (|.)", // next page
};
STR16 iEditorMapInfoToolbarText[] =
@@ -515,7 +518,7 @@ STR16 iEditorOptionsToolbarText[]=
L"Load map",
L"Select tileset",
L"Leave Editor mode",
L"Exit game.",
L"Exit game",
L"Create radar map",
L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",
+8 -5
View File
@@ -316,6 +316,7 @@ STR16 BoxFilter[] =
STR16 iEditorItemStatsButtonsText[] =
{
L"Delete",
L"Delete item (|D|e|l)",
};
STR16 FaceDirs[8] =
@@ -353,11 +354,11 @@ STR16 iEditorMercsToolbarText[] =
L"Schedule mode",
L"Schedule mode",
L"DELETE",
L"Delete currently selected merc (DEL).",
L"Delete currently selected merc (|D|e|l)",
L"NEXT", //20
L"Find next merc (SPACE).",
L"Find next merc (|S|p|a|c|e)",
L"Toggle priority existance",
L"Toggle whether or not placement has/naccess to all doors.",
L"Toggle whether or not placement has/naccess to all doors",
//Orders
L"STATIONARY",
@@ -462,7 +463,9 @@ STR16 iEditorItemsToolbarText[] =
L"E3",
L"Triggers",
L"Keys",
L"Rnd", // TODO.Translate
L"Rnd", //10
L"Previous (|,)", // previous page
L"Next (|.)", // next page
};
STR16 iEditorMapInfoToolbarText[] =
@@ -490,7 +493,7 @@ STR16 iEditorOptionsToolbarText[]=
L"Load map",
L"Select tileset",
L"Leave Editor mode",
L"Exit game.",
L"Exit game",
L"Create radar map",
L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",
+8 -5
View File
@@ -323,6 +323,7 @@ STR16 BoxFilter[] =
STR16 iEditorItemStatsButtonsText[] =
{
L"Usuń",
L"Przedmiot usuń (|D|e|l)",
};
STR16 FaceDirs[8] =
@@ -360,11 +361,11 @@ STR16 iEditorMercsToolbarText[] =
L"Tryb planowania",
L"Tryb planowania",
L"Usuń",
L"Usuń zaznaczonego najemnika (DEL).",
L"Usuń zaznaczonego najemnika (|D|e|l)",
L"Kolejny", //20
L"Znajdź następnego najemnika (SPACE).",
L"Znajdź następnego najemnika (|S|p|a|c|e)",
L"Włącz priorytet egzystencji",
L"Postać ma dostęp do wszystkich zamkniętych drzwi.",
L"Postać ma dostęp do wszystkich zamkniętych drzwi",
//Orders
L"STACJONARNY",
@@ -469,7 +470,9 @@ STR16 iEditorItemsToolbarText[] =
L"E3",
L"Włączniki",
L"Klucze",
L"Rnd", // TODO.Translate
L"Rnd", //10 // TODO.Translate
L"Previous (|,)", // previous page // TODO.Translate
L"Next (|.)", // next page // TODO.Translate
};
STR16 iEditorMapInfoToolbarText[] =
@@ -497,7 +500,7 @@ STR16 iEditorOptionsToolbarText[]=
L"Wczytaj mapę",
L"Wybierz zestaw",
L"Wyjdź z trybu edycji do trybu gry",
L"Wyjdź z trybu edycji.",
L"Wyjdź z trybu edycji",
L"Utwórz mapę radaru",
L"Kiedy zaznaczone, mapa będzie zapisana w oryginalnym formacie JA2.\nTa opcja jest ważna przy normalnych wielkoŚciach map, których numery siatki nie są (siatki wyjŚcia) > 25600.",
L"Kiedy zaznaczone, wczytana mapa lub nowa, będzie powiększona automatycznie do wybranych rozmiarów.",
+8 -5
View File
@@ -318,6 +318,7 @@ STR16 BoxFilter[] =
STR16 iEditorItemStatsButtonsText[] =
{
L"Delete",
L"Delete item (|D|e|l)",
};
STR16 FaceDirs[8] =
@@ -355,11 +356,11 @@ STR16 iEditorMercsToolbarText[] =
L"Schedule mode",
L"Schedule mode",
L"DELETE",
L"Delete currently selected merc (DEL).",
L"Delete currently selected merc (|D|e|l)",
L"NEXT", //20
L"Find next merc (SPACE).",
L"Find next merc (|S|p|a|c|e)",
L"Toggle priority existance",
L"Toggle whether or not placement has/naccess to all doors.",
L"Toggle whether or not placement has/naccess to all doors",
//Orders
L"STATIONARY",
@@ -464,7 +465,9 @@ STR16 iEditorItemsToolbarText[] =
L"E3",
L"Triggers",
L"Keys",
L"Rnd", // TODO.Translate
L"Rnd", //10
L"Previous (|,)", // previous page
L"Next (|.)", // next page
};
STR16 iEditorMapInfoToolbarText[] =
@@ -492,7 +495,7 @@ STR16 iEditorOptionsToolbarText[]=
L"Load map",
L"Select tileset",
L"Leave Editor mode",
L"Exit game.",
L"Exit game",
L"Create radar map",
L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",
+8 -5
View File
@@ -316,6 +316,7 @@ STR16 BoxFilter[] =
STR16 iEditorItemStatsButtonsText[] =
{
L"Delete",
L"Delete item (|D|e|l)",
};
STR16 FaceDirs[8] =
@@ -353,11 +354,11 @@ STR16 iEditorMercsToolbarText[] =
L"Schedule mode",
L"Schedule mode",
L"DELETE",
L"Delete currently selected merc (DEL).",
L"Delete currently selected merc (|D|e|l)",
L"NEXT", //20
L"Find next merc (SPACE).",
L"Find next merc |S|p|a|c|e)",
L"Toggle priority existance",
L"Toggle whether or not placement has/naccess to all doors.",
L"Toggle whether or not placement has/naccess to all doors",
//Orders
L"STATIONARY",
@@ -462,7 +463,9 @@ STR16 iEditorItemsToolbarText[] =
L"E3",
L"Triggers",
L"Keys",
L"Rnd", // TODO.Translate
L"Rnd", //10
L"Previous (|,)", // previous page
L"Next (|.)", // next page
};
STR16 iEditorMapInfoToolbarText[] =
@@ -490,7 +493,7 @@ STR16 iEditorOptionsToolbarText[]=
L"Load map",
L"Select tileset",
L"Leave Editor mode",
L"Exit game.",
L"Exit game",
L"Create radar map",
L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",