Changeset 294

Timestamp:

Mar 29, 2019, 8:40:42 AM (6 years ago)

Author:

chronos

Message:

• Modified: Change terrain type ttCity to map cell building with special type stCity.

Location:

trunk

Files:

• Languages/xtactics.cs.po (modified) (4 diffs)
• Languages/xtactics.po (modified) (4 diffs)
• Systems/HexWars.xts (modified) (1 diff)
• UBuilding.pas (modified) (8 diffs)
• UClientGUI.pas (modified) (4 diffs)
• UGame.pas (modified) (6 diffs)
• UItemList.pas (modified) (1 diff)
• UMap.pas (modified) (7 diffs)
• UPlayer.pas (modified) (2 diffs)

trunk/Languages/xtactics.cs.po

@@ -877 +877 @@
 msgstr "Obecné"
 
-#: tformunitkind.buttoncancel.caption
-msgctxt "tformunitkind.buttoncancel.caption"
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: tformunitkind.buttonok.caption
-msgctxt "tformunitkind.buttonok.caption"
-msgid "OK"
-msgstr "OK"
-
-#: tformunitkind.caption
-msgid "Unit kind"
-msgstr "Druh jednotky"
-
-#: tformunitkind.labelhealth.caption
-msgid "Health:"
-msgstr "Zdraví:"
-
-#: tformunitkind.labelname.caption
-msgctxt "tformunitkind.labelname.caption"
-msgid "Name:"
-msgstr "Jméno:"
-
-#: tformunitkinds.aadd.caption
-msgctxt "tformunitkinds.aadd.caption"
-msgid "Add"
-msgstr "Přidat"
-
-#: tformunitkinds.aclone.caption
-msgctxt "tformunitkinds.aclone.caption"
-msgid "Clone"
-msgstr "Klonovat"
-
-#: tformunitkinds.amodify.caption
-msgctxt "tformunitkinds.amodify.caption"
-msgid "Modify"
-msgstr "Upravit"
-
-#: tformunitkinds.aremove.caption
-msgctxt "tformunitkinds.aremove.caption"
-msgid "Remove"
-msgstr "Odstranit"
-
-#: tformunitkinds.aselectall.caption
-msgctxt "tformunitkinds.aselectall.caption"
-msgid "Select all"
-msgstr "Vybrat vše"
-
-#: tformunitkinds.caption
-msgid "Unit kinds"
-msgstr "Druhy jednotek"
-
-#: tformunitkinds.listview1.columns[0].caption
-msgctxt "tformunitkinds.listview1.columns[0].caption"
-msgid "Name"
-msgstr "Jméno"
-
 #: ubuilding.sbuildingkind
 msgctxt "ubuilding.sbuildingkind"
@@ -940 +883 @@
 
 #: ubuilding.scost
+msgctxt "ubuilding.scost"
 msgid "Cost"
 msgstr "Cena"
+
+#: ubuilding.sspecialtype
+msgid "Special type"
+msgstr "Speciální typ"
 
 #: uclientgui.swrongarrowangle
@@ -1200 +1148 @@
 msgstr "Opravdu chcete odstranit vybrané položky?"
 
-#: uformunitkinds.snewunitkind
-msgid "New unit kind"
-msgstr "Nový druh jednotky"
-
-#: uformunitkinds.sremoveitems
-msgctxt "uformunitkinds.sremoveitems"
-msgid "Remove items"
-msgstr "Odstranit položky"
-
-#: uformunitkinds.sremoveitemsquery
-msgctxt "uformunitkinds.sremoveitemsquery"
-msgid "Do you want to remove selected items?"
-msgstr "Opravdu chcete odstranit vybrané položky?"
-
 #: ugame.scomputer
 msgctxt "ugame.scomputer"
@@ -1341 +1275 @@
 msgstr "Neukončená bitva"
 
+#: uunit.scost
+msgctxt "uunit.scost"
+msgid "Cost"
+msgstr "Cena"
+
+#: uunit.smoves
+msgid "Moves"
+msgstr "Pohyby"
+
+#: uunit.spowerattack
+msgid "Attack power"
+msgstr "Síla útoku"
+
+#: uunit.spowerdefense
+msgid "Defense power"
+msgstr "Síla obrany"
+
+#: uunit.sstack
+msgid "Stack"
+msgstr "Sada"
+
+#: uunit.sunitkind
+msgctxt "uunit.sunitkind"
+msgid "Unit kind"
+msgstr "Druh jednotky"
+
+#: uunit.sviewrange
+msgid "View range"
+msgstr "Dohled"

trunk/Languages/xtactics.po

@@ -863 +863 @@
 msgstr ""
 
-#: tformunitkind.buttoncancel.caption
-msgctxt "tformunitkind.buttoncancel.caption"
-msgid "Cancel"
-msgstr ""
-
-#: tformunitkind.buttonok.caption
-msgctxt "tformunitkind.buttonok.caption"
-msgid "OK"
-msgstr ""
-
-#: tformunitkind.caption
-msgid "Unit kind"
-msgstr ""
-
-#: tformunitkind.labelhealth.caption
-msgid "Health:"
-msgstr ""
-
-#: tformunitkind.labelname.caption
-msgctxt "tformunitkind.labelname.caption"
-msgid "Name:"
-msgstr ""
-
-#: tformunitkinds.aadd.caption
-msgctxt "tformunitkinds.aadd.caption"
-msgid "Add"
-msgstr ""
-
-#: tformunitkinds.aclone.caption
-msgctxt "tformunitkinds.aclone.caption"
-msgid "Clone"
-msgstr ""
-
-#: tformunitkinds.amodify.caption
-msgctxt "tformunitkinds.amodify.caption"
-msgid "Modify"
-msgstr ""
-
-#: tformunitkinds.aremove.caption
-msgctxt "tformunitkinds.aremove.caption"
-msgid "Remove"
-msgstr ""
-
-#: tformunitkinds.aselectall.caption
-msgctxt "tformunitkinds.aselectall.caption"
-msgid "Select all"
-msgstr ""
-
-#: tformunitkinds.caption
-msgid "Unit kinds"
-msgstr ""
-
-#: tformunitkinds.listview1.columns[0].caption
-msgctxt "tformunitkinds.listview1.columns[0].caption"
-msgid "Name"
-msgstr ""
-
 #: ubuilding.sbuildingkind
 msgctxt "ubuilding.sbuildingkind"
@@ -926 +869 @@
 
 #: ubuilding.scost
+msgctxt "ubuilding.scost"
 msgid "Cost"
+msgstr ""
+
+#: ubuilding.sspecialtype
+msgid "Special type"
 msgstr ""
 
@@ -1178 +1126 @@
 msgstr ""
 
-#: uformunitkinds.snewunitkind
-msgid "New unit kind"
-msgstr ""
-
-#: uformunitkinds.sremoveitems
-msgctxt "uformunitkinds.sremoveitems"
-msgid "Remove items"
-msgstr ""
-
-#: uformunitkinds.sremoveitemsquery
-msgctxt "uformunitkinds.sremoveitemsquery"
-msgid "Do you want to remove selected items?"
-msgstr ""
-
 #: ugame.scomputer
 msgctxt "ugame.scomputer"
@@ -1310 +1244 @@
 msgstr ""
 
+#: uunit.scost
+msgctxt "uunit.scost"
+msgid "Cost"
+msgstr ""
+
+#: uunit.smoves
+msgid "Moves"
+msgstr ""
+
+#: uunit.spowerattack
+msgid "Attack power"
+msgstr ""
+
+#: uunit.spowerdefense
+msgid "Defense power"
+msgstr ""
+
+#: uunit.sstack
+msgid "Stack"
+msgstr ""
+
+#: uunit.sunitkind
+msgctxt "uunit.sunitkind"
+msgid "Unit kind"
+msgstr ""
+
+#: uunit.sviewrange
+msgid "View range"
+msgstr ""
+

trunk/Systems/HexWars.xts

@@ -17 +17 @@
     </UnitKind>
   </UnitKinds>
-  <BuildingKinds/>
+  <BuildingKinds>
+    <BuildingKind>
+      <Id>0</Id>
+      <Name>City</Name>
+      <Cost>0</Cost>
+      <SpecialType>9515521</SpecialType>
+    </BuildingKind>
+  </BuildingKinds>
   <Nations>
     <Nation>

trunk/UBuilding.pas

@@ -9 +9 @@
 
 type
+  TBuildingSpecialType = (stNone, stCity);
 
   { TBuildingKind }
@@ -14 +15 @@
   TBuildingKind = class(TItem)
     Cost: Integer;
+    SpecialType: TBuildingSpecialType;
     class function GetFields: TItemFields; override;
     procedure GetValue(Index: Integer; out Value); override;
@@ -25 +27 @@
   TBuildingKinds = class(TItemList)
     class function GetItemClass: TItemClass; override;
+    function FindBySpecialType(SpecialType: TBuildingSpecialType): TItem;
   end;
 
-  TBuilding = class
+  { TBuilding }
+
+  TBuilding = class(TItem)
+  private
+    FMapCell: TObject;
+    procedure SetMapCell(AValue: TObject);
+  public
     Kind: TBuildingKind;
+    property MapCell: TObject read FMapCell write SetMapCell; // TMapCell;
+  end;
+
+  { TBuildings }
+
+  TBuildings = class(TItemList)
+    Game: TObject; // TGame;
+    class function GetItemClass: TItemClass; override;
   end;
 
@@ -34 +51 @@
   SBuildingKind = 'Building';
   SCost = 'Cost';
+  SSpecialType = 'Special type';
 
 
 implementation
+
+uses
+  UMap;
+
+{ TBuildings }
+
+class function TBuildings.GetItemClass: TItemClass;
+begin
+  Result := TBuilding;
+end;
+
+{ TBuilding }
+
+procedure TBuilding.SetMapCell(AValue: TObject);
+var
+  OldValue: TCell;
+begin
+  if FMapCell = AValue then Exit;
+  OldValue := TCell(FMapCell);
+  FMapCell := nil;
+  if Assigned(OldValue) then TCell(OldValue).Building := nil;
+  FMapCell := AValue;
+  if Assigned(FMapCell) then TCell(FMapCell).Building := Self;
+end;
 
 { TBuildingKind }
@@ -44 +86 @@
   Result := inherited;
   Result.AddField(2, 'Cost', SCost, dtInteger);
+  Result.AddField(3, 'SpecialType', SSpecialType, dtInteger);
 end;
 
@@ -50 +93 @@
   if Index = 1 then string(Value) := Name
   else if Index = 2 then Integer(Value) := Cost
+  else if Index = 3 then TBuildingSpecialType(Value) := SpecialType
   else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
 end;
@@ -57 +101 @@
   if Index = 1 then Name := string(Value)
   else if Index = 2 then Cost := Integer(Value)
+  else if Index = 3 then SpecialType := TBuildingSpecialType(Value)
   else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
 end;
@@ -77 +122 @@
 end;
 
+function TBuildingKinds.FindBySpecialType(SpecialType: TBuildingSpecialType
+  ): TItem;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (TBuildingKind(Items[I]).SpecialType <> SpecialType) do Inc(I);
+  if I < Count then Result := Items[I]
+    else Result := nil;
+end;
+
 end.
 

trunk/UClientGUI.pas

@@ -70 +70 @@
 implementation
 
+uses
+  UBuilding;
+
 resourcestring
   SZeroZoomNotAlowed = 'Zero zoom not allowed';
@@ -179 +182 @@
       Pen.Width := 1;
     end else
-    if Cell.Terrain = ttCity then begin
+    if Assigned(Cell.Building) and (Cell.Building.Kind.SpecialType = stCity) then begin
       // Cannot set clear border as it will display shifted on gtk2
       //Pen.Style := psClear;
@@ -441 +444 @@
       for Cell in ControlPlayer.PlayerMap.Cells do begin
         if (Cell.MapCell.Terrain <> ttVoid) and View.IsCellVisible(Cell.MapCell) then begin
-          if Cell.MapCell.Terrain = ttCity then begin
+          if Assigned(Cell.MapCell.Building) and (Cell.MapCell.Building.Kind.SpecialType = stCity) then begin
             // Cannot set clear border as it will display shifted on gtk2
             //Pen.Style := psClear;
@@ -461 +464 @@
         if (MapCell.Terrain <> ttVoid) and View.IsCellVisible(MapCell) then begin
           if View.IsCellVisible(MapCell) and (MapCell.Terrain <> ttVoid) then begin
-            if MapCell.Terrain = ttCity then begin
+            if Assigned(MapCell.Building) and (MapCell.Building.Kind.SpecialType = stCity) then begin
               // Cannot set clear border as it will display shifted on gtk2
               //Pen.Style := psClear;

trunk/UGame.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, ExtCtrls, Graphics, XMLConf, XMLRead, XMLWrite, Forms,
-  DOM, Math, LazFileUtils, UXMLUtils, Dialogs, LCLType, LCLIntf, fgl,
+  DOM, Math, LazFileUtils, UXMLUtils, Dialogs, LCLType, LCLIntf, fgl, UBuilding,
   UGeometry, UPlayer, UMap, UMapType, UUnit, UGameSystem;
 
@@ -64 +64 @@
     Players: TPlayers;
     Units: TUnits;
+    Buildings: TBuildings;
     Map: TMap;
     MapImageFileName: string;
@@ -315 +316 @@
   for Cell in Map.Cells do
   with Cell do begin
-    if (Terrain = ttNormal) and CityEnabled and (Random < CityPercentage / 100) then
-      Terrain := ttCity;
+    if (Terrain = ttNormal) and CityEnabled and (Random < CityPercentage / 100) then begin
+      Building := TBuilding(Buildings.AddItem('City'));
+      Building.Kind := TBuildingKind(GameSystem.BuildingKinds.FindBySpecialType(stCity));
+    end;
   end;
 end;
@@ -341 +344 @@
           StartCell := Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(Players[0].StartCell)];
 
-        if CityEnabled then StartCell.Terrain := ttCity;
+        if CityEnabled then begin
+          StartCell.Building := TBuilding(Buildings.AddItem('City'));
+          StartCell.Building.Kind := TBuildingKind(GameSystem.BuildingKinds.FindBySpecialType(stCity));
+        end;
         StartCell.Player := Player;
         if not Assigned(StartCell.OneUnit) then
@@ -855 +861 @@
   Units := TUnits.Create;
   Units.Game := Self;
+  Buildings := TBuildings.Create;
+  Buildings.Game := Self;
   Map := TMap.Create;
   Map.Game := Self;
@@ -878 +886 @@
   FreeAndNil(Players);
   FreeAndNil(Map);
+  FreeAndNil(Buildings);
   FreeAndNil(Units);
   inherited Destroy;

trunk/UItemList.pas

@@ -10 +10 @@
 type
   TDataType = (dtNone, dtString, dtBoolean, dtInteger, dtFloat, dtColor,
-    dtTime, dtDate, dtDateTime);
+    dtTime, dtDate, dtDateTime, dtEnumeration);
 
   { TItemField }

trunk/UMap.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, ExtCtrls, UGeometry, DOM, fgl,
+  Classes, SysUtils, Graphics, ExtCtrls, UGeometry, DOM, fgl, UBuilding,
   UXMLUtils, UUnit;
 
@@ -18 +18 @@
   TCellLinks = class;
 
-  TTerrainType = (ttVoid, ttNormal, ttCity);
+  TTerrainType = (ttVoid, ttNormal, ttCityUnused);
   TExtraType = (etNone, etObjectiveTarget, etAttack, etDefense, etLookout,
     etGrowLow, etGrowMedium, etGrowHigh);
@@ -27 +27 @@
   private
     FArea: TMapArea;
+    FBuilding: TBuilding;
     FId: Integer;
     FMap: TMap;
@@ -33 +34 @@
     function GetPower: Integer;
     procedure SetArea(AValue: TMapArea);
+    procedure SetBuilding(AValue: TBuilding);
     procedure SetId(AValue: Integer);
     procedure SetPower(AValue: Integer);
@@ -67 +69 @@
     property Area: TMapArea read FArea write SetArea;
     property OneUnit: TUnit read FUnit write SetUnit;
+    property Building: TBuilding read FBuilding write SetBuilding;
     //property Power: Integer read GetPower;
   end;
@@ -619 +622 @@
       if Assigned(OneUnit) then
         Inc(TotalUnits, OneUnit.Power);
-      if Terrain = ttCity then
+      if Assigned(Building) and (Building.Kind.SpecialType = stCity) then
         Inc(TotalCities);
       if Extra = etObjectiveTarget then
@@ -968 +971 @@
 end;
 
+procedure TCell.SetBuilding(AValue: TBuilding);
+var
+  OldValue: TBuilding;
+begin
+  if FBuilding = AValue then Exit;
+  OldValue := FBuilding;
+  FBuilding := nil;
+  if Assigned(OldValue) then OldValue.MapCell := nil;
+  FBuilding := AValue;
+  if Assigned(FBuilding) then FBuilding.MapCell := Self;
+end;
+
 function TCell.GetPower: Integer;
 begin

trunk/UPlayer.pas

@@ -210 +210 @@
 
 uses
-  UGame, UGameSystem;
+  UGame, UGameSystem, UBuilding;
 
 resourcestring
@@ -1316 +1316 @@
   with TCell(Cells[I]) do begin
     if (Player = Self) and ((TGame(Game).GrowCells = gcPlayerAll) or
-    ((TGame(Game).GrowCells = gcPlayerCities) and (Terrain = ttCity))) then begin
+    ((TGame(Game).GrowCells = gcPlayerCities) and (Assigned(Building) and (Building.Kind.SpecialType = stCity)))) then begin
       if not Assigned(OneUnit) then begin
         NewUnit := TGame(Game).Units.AddNew(TUnitKind(TGame(Game).GameSystem.UnitKinds.First), 0);