Changeset 262
- Timestamp:
- Sep 24, 2018, 11:46:31 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Forms/UFormNew.lfm
r250 r262 550 550 object ComboBoxWinObjective: TComboBox 551 551 Left = 224 552 Height = 40552 Height = 36 553 553 Top = 244 554 554 Width = 328 … … 653 653 end 654 654 end 655 object CheckBoxEmptyCellsNeutral: TCheckBox 656 Left = 336 657 Height = 30 658 Top = 62 659 Width = 360 660 Caption = 'Set cells without player units as neutral' 661 TabOrder = 5 662 end 655 663 end 656 664 end -
trunk/Forms/UFormNew.pas
r247 r262 31 31 ButtonPlayerModify: TButton; 32 32 ButtonPlayerRemove: TButton; 33 CheckBoxEmptyCellsNeutral: TCheckBox; 33 34 CheckBoxBridges: TCheckBox; 34 35 CheckBoxCity: TCheckBox; … … 538 539 SpinEditTurns.Value := StayAliveForDefinedTurns; 539 540 SpinEditSpecialCells.Value := SpecialCaptureCellCount; 541 CheckBoxEmptyCellsNeutral.Checked := EmptyCellsNeutral; 540 542 end; 541 543 end; … … 580 582 StayAliveForDefinedTurns := SpinEditTurns.Value; 581 583 SpecialCaptureCellCount := SpinEditSpecialCells.Value; 584 EmptyCellsNeutral := CheckBoxEmptyCellsNeutral.Checked; 582 585 end; 583 586 end; -
trunk/Forms/UFormSettings.lfm
r243 r262 1 1 object FormSettings: TFormSettings 2 2 Left = 535 3 Height = 3 284 Top = 4175 Width = 6053 Height = 359 4 Top = 386 5 Width = 576 6 6 ActiveControl = ButtonOk 7 7 Caption = 'Settings' 8 ClientHeight = 3 289 ClientWidth = 6058 ClientHeight = 359 9 ClientWidth = 576 10 10 Constraints.MinHeight = 300 11 11 Constraints.MinWidth = 454 12 DesignTimePPI = 1 2012 DesignTimePPI = 144 13 13 OnClose = FormClose 14 14 OnCreate = FormCreate … … 17 17 LCLVersion = '1.8.2.0' 18 18 object ButtonOk: TButton 19 Left = 52219 Left = 493 20 20 Height = 25 21 Top = 28921 Top = 320 22 22 Width = 75 23 23 Anchors = [akRight, akBottom] … … 27 27 end 28 28 object ButtonCancel: TButton 29 Left = 42729 Left = 398 30 30 Height = 25 31 Top = 28931 Top = 320 32 32 Width = 75 33 33 Anchors = [akRight, akBottom] … … 38 38 object PageControl1: TPageControl 39 39 Left = 8 40 Height = 27340 Height = 304 41 41 Top = 8 42 Width = 5 8943 ActivePage = TabSheet Debug42 Width = 560 43 ActivePage = TabSheetGeneral 44 44 Align = alTop 45 45 Anchors = [akTop, akLeft, akRight, akBottom] 46 46 BorderSpacing.Around = 8 47 TabIndex = 147 TabIndex = 0 48 48 TabOrder = 2 49 49 object TabSheetGeneral: TTabSheet 50 50 Caption = 'General' 51 ClientHeight = 2 4052 ClientWidth = 5 8151 ClientHeight = 260 52 ClientWidth = 554 53 53 object Panel1: TPanel 54 54 Left = 0 55 Height = 2 4055 Height = 260 56 56 Top = 0 57 Width = 5 8157 Width = 554 58 58 Align = alClient 59 59 BevelOuter = bvNone 60 ClientHeight = 2 4061 ClientWidth = 5 8160 ClientHeight = 260 61 ClientWidth = 554 62 62 TabOrder = 0 63 63 object Label1: TLabel 64 64 Left = 20 65 Height = 2 066 Top = 2667 Width = 6865 Height = 26 66 Top = 32 67 Width = 88 68 68 Caption = 'Language:' 69 69 ParentColor = False … … 71 71 object ComboBoxLanguage: TComboBox 72 72 Left = 178 73 Height = 2873 Height = 40 74 74 Top = 24 75 75 Width = 196 76 ItemHeight = 2076 ItemHeight = 0 77 77 Style = csDropDownList 78 78 TabOrder = 0 79 79 end 80 80 object ComboBoxTheme: TComboBox 81 Left = 17 882 Height = 2883 Top = 5681 Left = 176 82 Height = 40 83 Top = 72 84 84 Width = 196 85 ItemHeight = 2085 ItemHeight = 0 86 86 Style = csDropDownList 87 87 TabOrder = 1 … … 89 89 object Label6: TLabel 90 90 Left = 20 91 Height = 2 092 Top = 5893 Width = 4891 Height = 26 92 Top = 80 93 Width = 63 94 94 Caption = 'Theme:' 95 95 ParentColor = False … … 97 97 object SpinEditAnimSpeed: TSpinEdit 98 98 Left = 232 99 Height = 28100 Top = 1 1099 Height = 36 100 Top = 120 101 101 Width = 122 102 102 TabOrder = 2 … … 104 104 object Label3: TLabel 105 105 Left = 368 106 Height = 2 0107 Top = 1 14108 Width = 1 2106 Height = 26 107 Top = 124 108 Width = 15 109 109 Caption = '%' 110 110 ParentColor = False … … 112 112 object Label2: TLabel 113 113 Left = 20 114 Height = 2 0115 Top = 1 10116 Width = 1 16114 Height = 26 115 Top = 120 116 Width = 150 117 117 Caption = 'Animation speed:' 118 118 ParentColor = False … … 120 120 object CheckBoxAutoSaveTurn: TCheckBox 121 121 Left = 20 122 Height = 24123 Top = 1 44124 Width = 2 13122 Height = 30 123 Top = 154 124 Width = 269 125 125 Caption = 'Autosave game on each turn' 126 126 TabOrder = 3 … … 128 128 object CheckBoxReopenLastFile: TCheckBox 129 129 Left = 20 130 Height = 24131 Top = 1 84132 Width = 198130 Height = 30 131 Top = 194 132 Width = 249 133 133 Caption = 'Reopen last game on start' 134 134 TabOrder = 4 … … 138 138 object TabSheetDebug: TTabSheet 139 139 Caption = 'Debug' 140 ClientHeight = 2 40141 ClientWidth = 5 81140 ClientHeight = 260 141 ClientWidth = 554 142 142 object Panel2: TPanel 143 143 Left = 0 144 Height = 2 40144 Height = 229 145 145 Top = 0 146 Width = 58 1146 Width = 583 147 147 Align = alClient 148 148 BevelOuter = bvNone 149 ClientHeight = 2 40150 ClientWidth = 58 1149 ClientHeight = 229 150 ClientWidth = 583 151 151 TabOrder = 0 152 152 object CheckBox2: TCheckBox … … 154 154 Height = 24 155 155 Top = 32 156 Width = 5 49156 Width = 551 157 157 Anchors = [akTop, akLeft, akRight] 158 158 AutoSize = False … … 163 163 object Label4: TLabel 164 164 Left = 14 165 Height = 2 0165 Height = 26 166 166 Top = 67 167 Width = 26167 Width = 35 168 168 Caption = 'DPI:' 169 169 ParentColor = False … … 171 171 object SpinEditX: TSpinEdit 172 172 Left = 104 173 Height = 28173 Height = 36 174 174 Top = 64 175 175 Width = 96 … … 181 181 object Label5: TLabel 182 182 Left = 208 183 Height = 2 0183 Height = 26 184 184 Top = 67 185 Width = 7185 Width = 10 186 186 Caption = 'x' 187 187 ParentColor = False … … 189 189 object SpinEditY: TSpinEdit 190 190 Left = 232 191 Height = 28191 Height = 36 192 192 Top = 64 193 193 Width = 90 … … 201 201 Height = 27 202 202 Top = 136 203 Width = 55 3203 Width = 555 204 204 Anchors = [akTop, akLeft, akRight] 205 205 AutoSize = False -
trunk/Languages/xtactics.cs.po
r258 r262 354 354 355 355 #: tformnew.aplayermodify.caption 356 #, fuzzy 357 #| msgid "Modify player" 356 358 msgctxt "tformnew.aplayermodify.caption" 357 msgid "Modify player"359 msgid "Modify" 358 360 msgstr "Upravit" 359 361 … … 379 381 msgstr "Odstranit" 380 382 381 #: tformnew.button1.caption382 msgctxt "tformnew.button1.caption"383 msgid "Add"384 msgstr "Přidat"385 386 #: tformnew.button2.caption387 msgctxt "tformnew.button2.caption"388 msgid "Remove"389 msgstr "Odstranit"390 391 #: tformnew.button3.caption392 msgctxt "tformnew.button3.caption"393 msgid "Modify"394 msgstr "Upravit"395 396 383 #: tformnew.buttoncancel.caption 397 384 msgctxt "tformnew.buttoncancel.caption" … … 409 396 msgstr "Ok" 410 397 411 #: tformnew.buttonplayeradd.caption412 msgctxt "tformnew.buttonplayeradd.caption"413 msgid "Add"414 msgstr "Přidat"415 416 #: tformnew.buttonplayermodify.caption417 msgctxt "tformnew.buttonplayermodify.caption"418 msgid "Modify"419 msgstr "Upravit"420 421 #: tformnew.buttonplayerremove.caption422 msgctxt "tformnew.buttonplayerremove.caption"423 msgid "Remove"424 msgstr "Odstranit"425 426 398 #: tformnew.caption 427 399 msgctxt "tformnew.caption" … … 441 413 msgid "Cyclic map" 442 414 msgstr "Cyklická mapa" 415 416 #: tformnew.checkboxemptycellsneutral.caption 417 msgid "Set cells without player units as neutral" 418 msgstr "Nastavit buňky bez jednotek hráče jako neutrální" 443 419 444 420 #: tformnew.checkboxfogofwar.caption -
trunk/Languages/xtactics.po
r258 r262 343 343 #: tformnew.aplayermodify.caption 344 344 msgctxt "tformnew.aplayermodify.caption" 345 msgid "Modify player"345 msgid "Modify" 346 346 msgstr "" 347 347 … … 366 366 msgstr "" 367 367 368 #: tformnew.button1.caption369 msgctxt "tformnew.button1.caption"370 msgid "Add"371 msgstr ""372 373 #: tformnew.button2.caption374 msgctxt "tformnew.button2.caption"375 msgid "Remove"376 msgstr ""377 378 #: tformnew.button3.caption379 msgctxt "tformnew.button3.caption"380 msgid "Modify"381 msgstr ""382 383 368 #: tformnew.buttoncancel.caption 384 369 msgctxt "TFORMNEW.BUTTONCANCEL.CAPTION" … … 396 381 msgstr "" 397 382 398 #: tformnew.buttonplayeradd.caption399 msgctxt "tformnew.buttonplayeradd.caption"400 msgid "Add"401 msgstr ""402 403 #: tformnew.buttonplayermodify.caption404 msgctxt "tformnew.buttonplayermodify.caption"405 msgid "Modify"406 msgstr ""407 408 #: tformnew.buttonplayerremove.caption409 msgctxt "tformnew.buttonplayerremove.caption"410 msgid "Remove"411 msgstr ""412 413 383 #: tformnew.caption 414 384 msgctxt "tformnew.caption" … … 427 397 #: tformnew.checkboxcyclicmap.caption 428 398 msgid "Cyclic map" 399 msgstr "" 400 401 #: tformnew.checkboxemptycellsneutral.caption 402 msgid "Set cells without player units as neutral" 429 403 msgstr "" 430 404 -
trunk/UGame.pas
r251 r262 77 77 BridgeEnabled: Boolean; 78 78 MaxPower: Integer; 79 EmptyCellsNeutral: Boolean; 79 80 procedure PostConfig; 80 81 procedure Assign(Source: TGame); … … 427 428 BridgeEnabled := Source.BridgeEnabled; 428 429 MaxPower := Source.MaxPower; 430 EmptyCellsNeutral := Source.EmptyCellsNeutral; 429 431 end; 430 432 … … 450 452 SetValue(DOMString(Path + '/StayAliveForDefinedTurns'), StayAliveForDefinedTurns); 451 453 SetValue(DOMString(Path + '/SpecialCaptureCellCount'), SpecialCaptureCellCount); 454 SetValue(DOMString(Path + '/EmptyCellsNeutral'), EmptyCellsNeutral); 452 455 Players.SaveConfig(Config, Path + '/Players'); 453 456 end; … … 485 488 StayAliveForDefinedTurns := GetValue(DOMString(Path + '/StayAliveForDefinedTurns'), 20); 486 489 SpecialCaptureCellCount := GetValue(DOMString(Path + '/SpecialCaptureCellCount'), 1); 490 EmptyCellsNeutral := GetValue(DOMString(Path + '/EmptyCellsNeutral'), False); 487 491 Players.LoadConfig(Config, Path + '/Players'); 488 492 end; … … 519 523 TurnCounter := ReadInteger(RootNode, 'TurnCounter', 0); 520 524 WinObjective := TWinObjective(ReadInteger(RootNode, 'WinObjective', Integer(woDefeatAllOponents))); 521 ReadInteger(RootNode, 'StayAliveForDefinedTurns', StayAliveForDefinedTurns); 525 StayAliveForDefinedTurns := ReadInteger(RootNode, 'StayAliveForDefinedTurns', 10); 526 EmptyCellsNeutral := ReadBoolean(RootNode, 'EmptyCellsNeutral', False); 522 527 523 528 NewNode := FindNode('Map'); … … 573 578 WriteInteger(RootNode, 'WinObjective', Integer(WinObjective)); 574 579 WriteInteger(RootNode, 'StayAliveForDefinedTurns', StayAliveForDefinedTurns); 580 WriteBoolean(RootNode, 'EmptyCellsNeutral', EmptyCellsNeutral); 575 581 WriteBoolean(RootNode, 'Running', Running); 576 582 … … 641 647 CurrentPlayer.MoveAll; 642 648 CurrentPlayer.Grow; 649 CurrentPlayer.UpdateEmptyCellsNeutral; 643 650 CurrentPlayer.UpdateRepeatMoves; 644 651 ComputePlayerStats; -
trunk/UPlayer.pas
r258 r262 121 121 procedure RemoveInvalidMoves; 122 122 procedure UpdateRepeatMoves; 123 procedure UpdateEmptyCellsNeutral; 123 124 procedure MoveAll; 124 125 procedure Grow; … … 1092 1093 end; 1093 1094 1095 procedure TPlayer.UpdateEmptyCellsNeutral; 1096 var 1097 I: Integer; 1098 begin 1099 if TGame(Game).EmptyCellsNeutral then 1100 for I := 0 to PlayerMap.Cells.Count - 1 do 1101 with TPlayerCell(PlayerMap.Cells[I]) do begin 1102 if MapCell.Power = 0 then MapCell.Player := nil; 1103 end; 1104 end; 1105 1094 1106 procedure TPlayer.RemoveEmptyUnitMoves; 1095 1107 var
Note:
See TracChangeset
for help on using the changeset viewer.