Complete.Org: Mailing Lists: Archives: freeciv-dev: March 2006:
[Freeciv-Dev] (PR#15809) Remove (ig)tired
Home

[Freeciv-Dev] (PR#15809) Remove (ig)tired

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Subject: [Freeciv-Dev] (PR#15809) Remove (ig)tired
From: "Per I. Mathisen" <per@xxxxxxxxxxx>
Date: Wed, 8 Mar 2006 11:01:46 -0800
Reply-to: bugs@xxxxxxxxxxx

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=15809 >

This patch removes the F_IGTIRED flag, which has been completely unused,
and the "tired penalty" for attackers that have less than 1 move left,
which is a newbie deathtrap. I strongly suspect that most if not all of
the complaints we have gotten from players who feel that "the AI cheats",
"I never win battles" or "the % chance to win is false" got burned by this
dubious feature. I see no redeeming value in it, so out it goes, IMHO.

  - Per

Index: data/default/units.ruleset
===================================================================
--- data/default/units.ruleset  (revision 11738)
+++ data/default/units.ruleset  (working copy)
@@ -116,7 +116,6 @@
 ; "Paratroopers"= (land only) can paradrop
 ; "Airbase"    = (land only) can produce airbases
 ; "Cities"     = can disband to produce a city
-; "IgTired"    = ignore tired penalty when attacking
 ; "No_Land_Attack" = (sea only) cannot attack targets on land
 ; "AddToCity"  = can disband to add a single point of population to a city
 ;                (see cities.ruleset for limitation of this ability)
Index: common/unittype.c
===================================================================
--- common/unittype.c   (revision 11738)
+++ common/unittype.c   (working copy)
@@ -43,7 +43,7 @@
   "Carrier", "OneAttack", "Pikemen", "Horse", "IgWall", "FieldUnit", 
   "AEGIS", "Fighter", "Marines", "Partial_Invis", "Settlers", "Diplomat",
   "Trireme", "Nuclear", "Spy", "Transform", "Paratroopers",
-  "Airbase", "Cities", "IgTired", "Missile_Carrier", "No_Land_Attack",
+  "Airbase", "Cities", "Missile_Carrier", "No_Land_Attack",
   "AddToCity", "Fanatic", "GameLoss", "Unique", "Unbribable", 
   "Undisbandable", "SuperSpy", "NoHome", "NoVeteran", "Bombarder",
   "CityBuster", "NoBuild", "BadWallAttacker", "BadCityDefender"
Index: common/unittype.h
===================================================================
--- common/unittype.h   (revision 11738)
+++ common/unittype.h   (working copy)
@@ -69,7 +69,6 @@
   F_PARATROOPERS,
   F_AIRBASE,          /* Can build Airbases */
   F_CITIES,           /* Can build cities */
-  F_IGTIRED,          /* Ignore tired negative bonus when attacking */
   F_MISSILE_CARRIER,  /* Like F_CARRIER, but missiles only (Submarine) */
   F_NO_LAND_ATTACK,   /* Cannot attack vs land squares (Submarine) */
   F_ADD_TO_CITY,      /* unit can add to city population */
Index: common/combat.c
===================================================================
--- common/combat.c     (revision 11738)
+++ common/combat.c     (working copy)
@@ -366,8 +366,7 @@
 
 /**************************************************************************
  Returns the attack power, modified by moves left, and veteran
- status. Set moves_left to SINGLE_MOVE to disable the reduction of
- power caused by tired units.
+ status.
 **************************************************************************/
 int base_get_attack_power(const struct unit_type *punittype,
                          int veteran, int moves_left)
@@ -377,9 +376,6 @@
   power = punittype->attack_strength * POWER_FACTOR;
   power *= punittype->veteran[veteran].power_fact;
 
-  if (!unit_type_flag(punittype, F_IGTIRED) && moves_left < SINGLE_MOVE) {
-    power = (power * moves_left) / SINGLE_MOVE;
-  }
   return power;
 }
 
Index: ai/advmilitary.c
===================================================================
--- ai/advmilitary.c    (revision 11738)
+++ ai/advmilitary.c    (working copy)
@@ -640,9 +640,6 @@
   if (unit_type_flag(punittype, F_CITYBUSTER)) {
     desire += desire / 2;
   }
-  if (unit_type_flag(punittype, F_IGTIRED)) {
-    desire += desire / 4;
-  }
   if (unit_type_flag(punittype, F_MARINES)) {
     desire += desire / 4;
   }
Index: ai/aihunt.c
===================================================================
--- ai/aihunt.c (revision 11738)
+++ ai/aihunt.c (working copy)
@@ -90,9 +90,6 @@
     if (unit_type_flag(ut, F_IGTER)) {
       desire += desire / 2;
     }
-    if (unit_type_flag(ut, F_IGTIRED)) {
-      desire += desire / 8;
-    }
     if (unit_type_flag(ut, F_PARTIAL_INVIS)) {
       desire += desire / 4;
     }
Index: client/helpdata.c
===================================================================
--- client/helpdata.c   (revision 11738)
+++ client/helpdata.c   (working copy)
@@ -957,11 +957,6 @@
     sprintf(buf + strlen(buf),
            _("* Ignores terrain effects (treats all squares as roads).\n"));
   }
-  if (unit_type_flag(utype, F_IGTIRED)) {
-    sprintf(buf + strlen(buf),
-           _("* Attacks with full strength even if less than "
-             "one movement left.\n"));
-  }
   if (unit_type_flag(utype, F_IGZOC)) {
     sprintf(buf + strlen(buf), _("* Ignores zones of control.\n"));
   }

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#15809) Remove (ig)tired, Per I. Mathisen <=