Changeset 558 for trunk/UnitProcessing.pas
- Timestamp:
- Apr 25, 2024, 6:31:34 PM (7 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/UnitProcessing.pas
r550 r558 596 596 MultiDamage := 2; 597 597 if (ABaseDamage = HealthAtt) and (PModel.Cap[mcFanatic] > 0) and 598 not (RW[pAtt].Government in [gRepublic, gDemocracy, gFuture]) then598 not (RW[pAtt].Government in [gRepublic, gDemocracy, gFuture]) then 599 599 MultiDamage := MultiDamage * 2; // fanatic attacker died 600 600 EndHealthDef := RW[Defender].Un[Duix].Health - MultiDamage * … … 608 608 begin 609 609 if (DModel.Cap[mcFanatic] > 0) and 610 not (RW[Defender].Government in [gRepublic, gDemocracy, gFuture]) then610 not (RW[Defender].Government in [gRepublic, gDemocracy, gFuture]) then 611 611 MultiDamage := MultiDamage * 2; // fanatic defender died 612 612 if PModel.Cap[mcFirst] > 0 then … … 1359 1359 if Result = eCity then 1360 1360 begin 1361 ObserveLevel[Loc0] := ObserveLevel[Loc0] and not (3 shl (2 * P));1361 ObserveLevel[Loc0] := ObserveLevel[Loc0] and not (3 shl (2 * P)); 1362 1362 Discover21(Loc0, P, lObserveUnhidden, True, True); 1363 1363 // CheckContact; … … 1383 1383 Health := Health - HostileDamage(P, mix, Loc, ToWork[Loc, Job]); 1384 1384 Dec(Movement, ToWork[Loc, Job]); 1385 if not (Job in [jCity, jPillage, jPoll]) then1385 if not (Job in [jCity, jPillage, jPoll]) then 1386 1386 Inc(Worked[P], ToWork[Loc, Job]); 1387 1387 if Job = jCity then … … 1400 1400 end; 1401 1401 {$IFOPT O-} if Mode < moPlaying then 1402 InvalidTreatyMap := not (1 shl P); {$ENDIF}1402 InvalidTreatyMap := not (1 shl P); {$ENDIF} 1403 1403 // territory should not be considered for the rest of the command 1404 1404 // execution, because during loading a game it's incorrect before … … 1417 1417 begin 1418 1418 Dec(ToWork[Loc, Job], Movement); 1419 if not (Job in [jCity, jPillage, jPoll]) then1419 if not (Job in [jCity, jPillage, jPoll]) then 1420 1420 Inc(Worked[P], Movement); 1421 1421 Health := Health - HostileDamage(P, mix, Loc, Movement);
Note:
See TracChangeset
for help on using the changeset viewer.