Changeset 614

Timestamp:

Sep 14, 2024, 5:43:37 PM (2 months ago)

Author:

chronos

Message:

• Added: Nwe editor menu action to create filled map with selected tile.

Location:

trunk

Files:

• GameServer.pas (modified) (6 diffs)
• Language.txt (modified) (2 diffs)
• LocalPlayer/KeyBindings.pas (modified) (2 diffs)
• LocalPlayer/Term.lfm (modified) (3 diffs)
• LocalPlayer/Term.pas (modified) (12 diffs)
• Localization/cs/Language.txt (modified) (2 diffs)
• Localization/de/Language.txt (modified) (2 diffs)
• Localization/fr/Language.txt (modified) (4 diffs)
• Localization/it/Language.txt (modified) (2 diffs)
• Localization/ru/Language.txt (modified) (2 diffs)
• Localization/zh-Hans/Language.txt (modified) (2 diffs)
• Localization/zh-Hant/Language.txt (modified) (2 diffs)
• Protocol.pas (modified) (2 diffs)

trunk/GameServer.pas

@@ -75 +75 @@
   MovieMode: Boolean): Boolean;
 procedure EditMap(const AMapFileName: string; Newlx, Newly, NewLandMass: Integer);
+procedure FillMap(TerrainType: Cardinal);
 procedure DirectHelp(Command: Integer);
 function ToAutoSaveFileName(FileName: string): string;
@@ -1363 +1364 @@
   Notify(ntBackOff);
   Inform(pTurn);
-  ChangeClientWhenDone(cTurn, 0, nil^, 0)
+  ChangeClientWhenDone(cTurn, 0, nil^, 0);
+end;
+
+procedure FillMap(TerrainType: Cardinal);
+var
+  Loc1: Integer;
+begin
+  for Loc1 := 0 to MapSize - 1 do
+    RealMap[Loc1] := TerrainType or ($F shl 27);
 end;
 
@@ -1375 +1384 @@
 procedure EditMap(const AMapFileName: string; Newlx, Newly, NewLandMass: Integer);
 var
-  p1, Loc1: Integer;
+  p1: Integer;
   Game: TNewGameData;
   Map: TMap;
@@ -1402 +1411 @@
     FreeAndNil(Map);
   end else begin
-    for Loc1 := 0 to MapSize - 1 do
-      RealMap[Loc1] := fOcean or ($F shl 27);
+    FillMap(fOcean);
   end;
   CL := nil;
@@ -3069 +3077 @@
 
     sRandomMap:
-      if (Player = 0) and MapGeneratorAvailable then
-      begin
+      if (Player = 0) and MapGeneratorAvailable then begin
         CreateElevation;
         PreviewElevation := False;
@@ -3076 +3083 @@
         FillChar(ObserveLevel, MapSize * 4, 0);
         DiscoverAll(Player, lObserveSuper);
-      end
-      else
-        Result := eInvalid;
+      end else Result := eInvalid;
+
+    sFillMap:
+      if Player = 0 then begin
+        FillMap(TFillMapData(Data).Tile);
+        FillChar(ObserveLevel, MapSize * 4, 0);
+        DiscoverAll(Player, lObserveSuper);
+      end else Result := eInvalid;
 
     sMapGeneratorRequest:

trunk/Language.txt

@@ -421 +421 @@
 #MAP_PREFSTART Preferred Starting Position
 #MAP_RANDOM Do you want to dismiss this map and replace it by an automatically generated random map?
+#MAP_FILL Do you want to dismiss this map and replace it by an automatically filled map?
 #MAP_CLOSE You're going to close this map.\Do you wish to save it?
 
@@ -551 +552 @@
 Previous Unit
 Next Unit
+Filled Map
 
 #ADVANCES

trunk/LocalPlayer/KeyBindings.pas

@@ -57 +57 @@
   BResign: TKeyBinding;
   BRandomMap: TKeyBinding;
+  BFillMap: TKeyBinding;
   BDisbandUnit: TKeyBinding;
   BFortify: TKeyBinding;
@@ -321 +322 @@
   BResign := AddItem('Resign', 'Resign', 'Ctrl+Q');
   BRandomMap := AddItem('RandomMap', 'Random map', 'Ctrl+R');
+  BFillMap := AddItem('FillMap', 'Fill map', 'Ctrl+F');
   BDisbandUnit := AddItem('DisbandUnit', 'Disband unit', 'Ctrl+D');
   BFortify := AddItem('Fortify', 'Fortify', 'F');

trunk/LocalPlayer/Term.lfm

@@ -14 +14 @@
   DesignTimePPI = 144
   Font.Color = clWindowText
-  Font.Height = -20
+  Font.Height = -45
   Font.Name = 'MS Sans Serif'
   KeyPreview = True
@@ -31 +31 @@
   OnShow = FormShow
   Position = poDefault
-  LCLVersion = '2.2.0.4'
+  LCLVersion = '3.4.0.0'
   Scaled = False
-  WindowState = wsNormal
   object UnitBtn: TButtonB
     Tag = 14
@@ -555 +554 @@
       OnClick = mRandomMapClick
     end
+    object mFillMap: TMenuItem
+      Tag = 102
+      GroupIndex = 1
+      ShortCut = 16454
+      OnClick = mFillMapClick
+    end
     object N3: TMenuItem
       Caption = '-'

trunk/LocalPlayer/Term.pas

@@ -12 +12 @@
 {$ENDIF}
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
-  LCLIntf, LCLType, SysUtils, Classes, DrawDlg, Types, Math,
+  LCLIntf, LCLType, Menus, SysUtils, Classes, DrawDlg, Types, Math,
   DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area,
   GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
@@ -34 +34 @@
   TMainScreen = class(TDrawDlg)
     mBigTiles: TMenuItem;
+    mFillMap: TMenuItem;
     mNextUnit: TMenuItem;
     N13: TMenuItem;
@@ -197 +198 @@
     procedure mDiagramClick(Sender: TObject);
     procedure mEmpireClick(Sender: TObject);
+    procedure mFillMapClick(Sender: TObject);
     procedure mEnhanceClick(Sender: TObject);
     procedure mEnhanceDefClick(Sender: TObject);
@@ -3761 +3763 @@
 end;
 
+procedure TMainScreen.mFillMapClick(Sender: TObject);
+var
+  FillMapData: TFillMapData;
+begin
+  if not Edited or (SimpleQuery(mkYesNo, Phrases.Lookup('MAP_FILL'), '')
+      = mrOK) then begin
+    FillMapData.Tile := BrushType;
+    Server(sFillMap, Me, 0, FillMapData);
+    Edited := True;
+    MapValid := False;
+    PaintAllMaps;
+  end;
+end;
+
 procedure TMainScreen.mEnhanceClick(Sender: TObject);
 begin
@@ -5220 +5236 @@
                       end;
                     end;
-                    Inc(Count)
+                    Inc(Count);
                   end;
                 end; // for uix:=0 to MyRO.nUn-1
@@ -5270 +5286 @@
               JobFocus := nJob + 3
             else
-              JobFocus := nJob + 4
+              JobFocus := nJob + 4;
           end;
           S := Phrases.Lookup('JOBRESULT', JobFocus);
@@ -5294 +5310 @@
             (PanelHeight - 1), Left + Width, Top + Height - Self.ClientHeight +
             PanelHeight, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight)
-    end; { if TroopLoc>=0 }
+    end; { if TroopLoc >= 0 }
   end;
 
@@ -5332 +5348 @@
   xTreasurySection := ClientWidth div 2 - 172;
   xResearchSection := ClientWidth div 2;
-  // ClientWidth div 2+68 = maximum to right
+  // ClientWidth div 2 + 68 = maximum to right
   FillLarge(TopBar.Canvas, 0, 0, ClientWidth, TopBarHeight - 3,
     ClientWidth div 2);
@@ -5422 +5438 @@
       if ScienceSum > 0 then
       begin
-        { j:=(i-MyRO.Research-1) div ScienceSum +1;
-          if J<1 then J:=1;
-          if J>1 then
-          S:=Format(Phrases.Lookup('TECHWAIT'),[S,J]); }
+        { j := (i - MyRO.Research - 1) div ScienceSum + 1;
+          if J < 1 then J := 1;
+          if J > 1 then
+          S := Format(Phrases.Lookup('TECHWAIT'), [S, J]); }
         LoweredTextOut(TopBar.Canvas, -1, MainTexture,
           xResearchSection + 48, 0, S);
@@ -7003 +7019 @@
   mResign.ShortCut := BResign.ShortCut;
   mRandomMap.ShortCut := BRandomMap.ShortCut;
+  mFillMap.ShortCut := BFillMap.ShortCut;
   mDisband.ShortCut := BDisbandUnit.ShortCut;
   mFort.ShortCut := BFortify.ShortCut;
@@ -7122 +7139 @@
     if BResign.Test(ShortCut) then mResign.Click
     else if BRandomMap.Test(ShortCut) then mRandomMap.Click
+    else if BFillMap.Test(ShortCut) then mFillMap.Click
     else if BHelp.Test(ShortCut) then mHelp.Click;
     (*if Shift = [ssCtrl] then
@@ -7474 +7492 @@
     mRandomMap.Visible := (ClientMode = cEditMap) and
       (Server(sMapGeneratorRequest, Me, 0, nil^) = eOK);
+    mFillMap.Visible := mRandomMap.Visible;
     mOptions.Visible := ClientMode <> cEditMap;
     mManip.Visible := ClientMode <> cEditMap;

trunk/Localization/cs/Language.txt

@@ -421 +421 @@
 #MAP_PREFSTART Preferovaná startovní pozice
 #MAP_RANDOM Chcete zrušit tuto mapu a nahradit ji automaticky vygenerovanou mapou?
+#MAP_FILL Chcete zrušit tuto mapu a nahradit ji automaticky vyplněnou mapou?
 #MAP_CLOSE Chystáte se zavřít tuto mapu.\Chcete ji uložit?
 
@@ -551 +552 @@
 Předchozí jednotka
 Další jednotka
+Vyplněná mapa
 
 #ADVANCES

trunk/Localization/de/Language.txt

@@ -430 +430 @@
 #MAP_PREFSTART Bevorzugte Startposition
 #MAP_RANDOM Karte löschen und durch eine automatisch erstellte Zufallskarte ersetzen?
+#MAP_FILL Do you want to dismiss this map and replace it by an automatically filled map?
 #MAP_CLOSE Der Kartograf wird beendet.\Soll die Karte gespeichert werden?
 
@@ -560 +561 @@
 Previous Unit
 Next Unit
+Filled Map
 
 #ADVANCES

trunk/Localization/fr/Language.txt

@@ -140 +140 @@
 #TITLE_SPYMISSION Opération secrète
 #TITLE_SUICIDE Mission suicide
+#TITLE_MESSAGE Message
 #FRMILREP Rapport militaire
-
 'Message Text
 #NOALTAI Aucune autre IA n'est installée.\Téléchargez d'autres modules d'IA à partir de la page d'accueil de C-evo ou créez le vôtre.
@@ -406 +406 @@
 #UTILIZE Utilisez
 #INTEGRATE Intégrer
+#NETWORK_SERVER Network Server
+#NETWORK_CLIENT Network Client
 
 'Busy Messages
@@ -418 +420 @@
 #MAP_PREFSTART Position de départ préférée
 #MAP_RANDOM Voulez-vous rejeter cette carte et la remplacer par une carte aléatoire générée automatiquement?
+#MAP_FILL Do you want to dismiss this map and replace it by an automatically filled map?
 #MAP_CLOSE Vous allez fermer cette carte.\Souhaitez-vous la sauvegarder?
 
@@ -543 +546 @@
 Patrouilles, attaques et captures uniquement
 Taille des carreaux
+Small
+Medium
+Big
+Previous Unit
+Next Unit
+Filled Map
 
 #ADVANCES

trunk/Localization/it/Language.txt

@@ -411 +411 @@
 #MAP_PREFSTART Punto di partenza preferenziale
 #MAP_RANDOM Vuoi buttare via questa mappa e rimpiazzarla con una generata casualmente?
+#MAP_FILL Do you want to dismiss this map and replace it by an automatically filled map?
 #MAP_CLOSE Stai chiudendo questa mappa.\La vuoi salvare?
 
@@ -541 +542 @@
 Previous Unit
 Next Unit
+Filled Map
 
 #ADVANCES

trunk/Localization/ru/Language.txt

@@ -437 +437 @@
 #MAP_PREFSTART Привилегированная исходная позиция
 #MAP_RANDOM Вы хотите отказаться от этой карты и заменить её случайно сгенерированной картой?
+#MAP_FILL Do you want to dismiss this map and replace it by an automatically filled map?
 #MAP_CLOSE Вы собираетесь закрыть Карту.\Вы хотите сохранить изменения?
 
@@ -567 +568 @@
 Previous Unit
 Next Unit
+Filled Map
 
 #ADVANCES

trunk/Localization/zh-Hans/Language.txt

@@ -429 +429 @@
 #MAP_PREFSTART 玩家种族初始位置
 #MAP_RANDOM 放弃当前的地图, 重新随机生成新的地图？
+#MAP_FILL Do you want to dismiss this map and replace it by an automatically filled map?
 #MAP_CLOSE 选择关闭当前的地图。\是否保存？
 
@@ -559 +560 @@
 Previous Unit
 Next Unit
+Filled Map
 
 #ADVANCES

trunk/Localization/zh-Hant/Language.txt

@@ -429 +429 @@
 #MAP_PREFSTART 玩家种族初始位置
 #MAP_RANDOM 放棄當前的地圖, 重新隨机生成新的地圖？
+#MAP_FILL Do you want to dismiss this map and replace it by an automatically filled map?
 #MAP_CLOSE 選擇關閉當前的地圖。\是否保存？
 
@@ -559 +560 @@
 Previous Unit
 Next Unit
+Filled Map
 
 #ADVANCES

trunk/Protocol.pas

@@ -116 +116 @@
   sRandomMap = $0780;
   sMapGeneratorRequest = $0790;
+  sFillMap = $07a0;
 
   // Server Internal Commands
@@ -1647 +1648 @@
     mix: Integer;
   end;
+  TFillMapData = record
+    Tile: Integer;
+  end;
 
   TTileList = array [0 .. INFIN] of Cardinal;