Author: cazfi
Date: Thu Jan 21 11:27:00 2016
New Revision: 31523

URL: http://svn.gna.org/viewcvs/freeciv?rev=31523&view=rev
Log:
Renamed hardcoded terrain transforming activity icon as "unit.plant", use tags
"unit.irrigation" and "unit.mine" tags named after the extras as primary tags
in supplied rulesets, hardcoded activity tags only as an alternative.

See bug #24329

Modified:
    trunk/client/tilespec.c
    trunk/data/alien/terrain.ruleset
    trunk/data/amplio/tiles.spec
    trunk/data/amplio2/activities.spec
    trunk/data/civ1/terrain.ruleset
    trunk/data/civ2/terrain.ruleset
    trunk/data/civ2civ3/terrain.ruleset
    trunk/data/classic/terrain.ruleset
    trunk/data/experimental/terrain.ruleset
    trunk/data/hex2t/items.spec
    trunk/data/hexemplio/unitextras.spec
    trunk/data/isotrident/tiles.spec
    trunk/data/multiplayer/terrain.ruleset
    trunk/data/sandbox/terrain.ruleset
    trunk/data/trident/tiles.spec

Modified: trunk/client/tilespec.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/client/tilespec.c     (original)
+++ trunk/client/tilespec.c     Thu Jan 21 11:27:00 2016
@@ -268,7 +268,7 @@
       *fortifying,
       *go_to,                  /* goto is a C keyword :-) */
       *irrigate,
-      *mine,
+      *plant,
       *pillage,
       *sentry,
       *stack,
@@ -2651,7 +2651,7 @@
   SET_SPRITE(unit.fortifying,  "unit.fortifying");
   SET_SPRITE(unit.go_to,       "unit.goto");
   SET_SPRITE(unit.irrigate,     "unit.irrigate"); 
-  SET_SPRITE(unit.mine,         "unit.mine");
+  SET_SPRITE(unit.plant,        "unit.plant");
   SET_SPRITE(unit.pillage,     "unit.pillage");
   SET_SPRITE(unit.sentry,      "unit.sentry");
   SET_SPRITE(unit.convert,      "unit.convert");      
@@ -3904,7 +3904,7 @@
     switch (punit->activity) {
     case ACTIVITY_MINE:
       if (punit->activity_target == NULL) {
-        s = t->sprites.unit.mine;
+        s = t->sprites.unit.plant;
       } else {
         s = t->sprites.extras[extra_index(punit->activity_target)].activity;
       }
@@ -5545,7 +5545,7 @@
         switch (ptask->act) {
         case ACTIVITY_MINE:
           if (ptask->tgt == NULL) {
-            ADD_SPRITE_SIMPLE(t->sprites.unit.mine);
+            ADD_SPRITE_SIMPLE(t->sprites.unit.plant);
           } else {
             
ADD_SPRITE_SIMPLE(t->sprites.extras[extra_index(ptask->tgt)].activity);
           }

Modified: trunk/data/alien/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/terrain.ruleset?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/alien/terrain.ruleset    (original)
+++ trunk/data/alien/terrain.ruleset    Thu Jan 21 11:27:00 2016
@@ -672,8 +672,8 @@
 rmcauses       = "Pillage"
 graphic        = "tx.irrigation"
 graphic_alt    = "-"
-activity_gfx   = "unit.irrigate"
-act_gfx_alt    = "-"
+activity_gfx   = "unit.irrigation"
+act_gfx_alt    = "unit.irrigate"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 build_time     = 0
@@ -689,7 +689,7 @@
 graphic        = "tx.mine"
 graphic_alt    = "-"
 activity_gfx   = "unit.mine"
-act_gfx_alt    = "-"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 build_time     = 0

Modified: trunk/data/amplio/tiles.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio/tiles.spec?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/amplio/tiles.spec        (original)
+++ trunk/data/amplio/tiles.spec        Thu Jan 21 11:27:00 2016
@@ -34,7 +34,7 @@
   2, 12, "unit.transform"
   2, 13, "unit.sentry"
   2, 14, "unit.goto"
-  2, 15, "unit.mine"
+  2, 15, "unit.plant"
   2, 16, "unit.pollution"
   2, 17, "unit.road"
   2, 18, "unit.irrigate"

Modified: trunk/data/amplio2/activities.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/activities.spec?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/amplio2/activities.spec  (original)
+++ trunk/data/amplio2/activities.spec  Thu Jan 21 11:27:00 2016
@@ -50,7 +50,7 @@
   3, 3, "unit.loaded"
 
   4, 0, "unit.irrigate"
-  4, 1, "unit.mine"
+  4, 1, "unit.plant"
   4, 2, "unit.transform"
   4, 3, "unit.pollution"
   4, 4, "unit.fallout"

Modified: trunk/data/civ1/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/terrain.ruleset?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/civ1/terrain.ruleset     (original)
+++ trunk/data/civ1/terrain.ruleset     Thu Jan 21 11:27:00 2016
@@ -816,8 +816,8 @@
 rmcauses       = "Pillage"
 graphic        = "tx.irrigation"
 graphic_alt    = "-"
-activity_gfx   = "unit.irrigate"
-act_gfx_alt    = "-"
+activity_gfx   = "unit.irrigation"
+act_gfx_alt    = "unit.irrigate"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 build_time     = 0
@@ -832,7 +832,7 @@
 graphic        = "tx.mine"
 graphic_alt    = "-"
 activity_gfx   = "unit.mine"
-act_gfx_alt    = "-"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 build_time     = 0

Modified: trunk/data/civ2/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/terrain.ruleset?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/civ2/terrain.ruleset     (original)
+++ trunk/data/civ2/terrain.ruleset     Thu Jan 21 11:27:00 2016
@@ -885,8 +885,8 @@
 rmcauses       = "Pillage"
 graphic        = "tx.irrigation"
 graphic_alt    = "-"
-activity_gfx   = "unit.irrigate"
-act_gfx_alt    = "-"
+activity_gfx   = "unit.irrigation"
+act_gfx_alt    = "unit.irrigate"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 build_time     = 0
@@ -902,7 +902,7 @@
 graphic        = "tx.mine"
 graphic_alt    = "-"
 activity_gfx   = "unit.mine"
-act_gfx_alt    = "-"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 build_time     = 0

Modified: trunk/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/terrain.ruleset?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/civ2civ3/terrain.ruleset (original)
+++ trunk/data/civ2civ3/terrain.ruleset Thu Jan 21 11:27:00 2016
@@ -1077,8 +1077,8 @@
 rmcauses       = "Pillage"
 graphic        = "tx.irrigation"
 graphic_alt    = "-"
-activity_gfx   = "unit.irrigate"
-act_gfx_alt    = "-"
+activity_gfx   = "unit.irrigation"
+act_gfx_alt    = "unit.irrigate"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 build_time     = 0
@@ -1094,7 +1094,7 @@
 graphic        = "tx.mine"
 graphic_alt    = "-"
 activity_gfx   = "unit.mine"
-act_gfx_alt    = "-"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 reqs           =
@@ -1114,7 +1114,7 @@
 graphic        = "tx.oil_mine"
 graphic_alt    = "tx.mine"
 activity_gfx   = "unit.oil_mine"
-act_gfx_alt    = "unit.mine"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 reqs           =

Modified: trunk/data/classic/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/terrain.ruleset?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/classic/terrain.ruleset  (original)
+++ trunk/data/classic/terrain.ruleset  Thu Jan 21 11:27:00 2016
@@ -1069,8 +1069,8 @@
 rmcauses       = "Pillage"
 graphic        = "tx.irrigation"
 graphic_alt    = "-"
-activity_gfx   = "unit.irrigate"
-act_gfx_alt    = "-"
+activity_gfx   = "unit.irrigation"
+act_gfx_alt    = "unit.irrigate"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 build_time     = 0
@@ -1086,7 +1086,7 @@
 graphic        = "tx.mine"
 graphic_alt    = "-"
 activity_gfx   = "unit.mine"
-act_gfx_alt    = "-"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 reqs           =
@@ -1105,7 +1105,7 @@
 graphic        = "tx.oil_mine"
 graphic_alt    = "tx.mine"
 activity_gfx   = "unit.oil_mine"
-act_gfx_alt    = "unit.mine"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 reqs           =

Modified: trunk/data/experimental/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/terrain.ruleset?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/experimental/terrain.ruleset     (original)
+++ trunk/data/experimental/terrain.ruleset     Thu Jan 21 11:27:00 2016
@@ -1043,8 +1043,8 @@
 rmcauses       = "Pillage"
 graphic        = "tx.irrigation"
 graphic_alt    = "-"
-activity_gfx   = "unit.irrigate"
-act_gfx_alt    = "-"
+activity_gfx   = "unit.irrigation"
+act_gfx_alt    = "unit.irrigate"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 build_time     = 0
@@ -1060,7 +1060,7 @@
 graphic        = "tx.mine"
 graphic_alt    = "-"
 activity_gfx   = "unit.mine"
-act_gfx_alt    = "-"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 reqs           =
@@ -1079,7 +1079,7 @@
 graphic        = "tx.oil_mine"
 graphic_alt    = "tx.mine"
 activity_gfx   = "unit.oil_mine"
-act_gfx_alt    = "unit.mine"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 reqs           =

Modified: trunk/data/hex2t/items.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/hex2t/items.spec?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/hex2t/items.spec (original)
+++ trunk/data/hex2t/items.spec Thu Jan 21 11:27:00 2016
@@ -219,7 +219,7 @@
   1, 8, "unit.transform"
   1, 9, "unit.sentry"
   1, 10, "unit.goto"
-  1, 11, "unit.mine"
+  1, 11, "unit.plant"
   1, 12, "unit.pollution"
   1, 13, "unit.road"
   1, 14, "unit.irrigate"

Modified: trunk/data/hexemplio/unitextras.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/hexemplio/unitextras.spec?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/hexemplio/unitextras.spec        (original)
+++ trunk/data/hexemplio/unitextras.spec        Thu Jan 21 11:27:00 2016
@@ -78,7 +78,7 @@
 
   4, 0, "unit.rest"
   4, 1, "unit.irrigate"
-  4, 2, "unit.mine"
+  4, 2, "unit.plant"
   4, 3, "unit.transform"
   4, 4, "unit.pillage"
   4, 5, "unit.pollution"

Modified: trunk/data/isotrident/tiles.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/isotrident/tiles.spec?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/isotrident/tiles.spec    (original)
+++ trunk/data/isotrident/tiles.spec    Thu Jan 21 11:27:00 2016
@@ -33,7 +33,7 @@
   2, 12, "unit.transform"
   2, 13, "unit.sentry"
   2, 14, "unit.goto"
-  2, 15, "unit.mine"
+  2, 15, "unit.plant"
   2, 16, "unit.pollution"
   2, 17, "unit.road"
   2, 18, "unit.irrigate"

Modified: trunk/data/multiplayer/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/terrain.ruleset?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/multiplayer/terrain.ruleset      (original)
+++ trunk/data/multiplayer/terrain.ruleset      Thu Jan 21 11:27:00 2016
@@ -1041,8 +1041,8 @@
 rmcauses       = "Pillage"
 graphic        = "tx.irrigation"
 graphic_alt    = "-"
-activity_gfx   = "unit.irrigate"
-act_gfx_alt    = "-"
+activity_gfx   = "unit.irrigation"
+act_gfx_alt    = "unit.irrigate"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 build_time     = 0
@@ -1058,7 +1058,7 @@
 graphic        = "tx.mine"
 graphic_alt    = "-"
 activity_gfx   = "unit.mine"
-act_gfx_alt    = "-"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 reqs           =
@@ -1077,7 +1077,7 @@
 graphic        = "tx.oil_mine"
 graphic_alt    = "tx.mine"
 activity_gfx   = "unit.oil_mine"
-act_gfx_alt    = "unit.mine"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 reqs           =

Modified: trunk/data/sandbox/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/terrain.ruleset?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/sandbox/terrain.ruleset  (original)
+++ trunk/data/sandbox/terrain.ruleset  Thu Jan 21 11:27:00 2016
@@ -1077,8 +1077,8 @@
 rmcauses       = "Pillage"
 graphic        = "tx.irrigation"
 graphic_alt    = "-"
-activity_gfx   = "unit.irrigate"
-act_gfx_alt    = "-"
+activity_gfx   = "unit.irrigation"
+act_gfx_alt    = "unit.irrigate"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 build_time     = 0
@@ -1094,7 +1094,7 @@
 graphic        = "tx.mine"
 graphic_alt    = "-"
 activity_gfx   = "unit.mine"
-act_gfx_alt    = "-"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 reqs           =
@@ -1114,7 +1114,7 @@
 graphic        = "tx.oil_mine"
 graphic_alt    = "tx.mine"
 activity_gfx   = "unit.oil_mine"
-act_gfx_alt    = "unit.mine"
+act_gfx_alt    = "unit.plant"
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 reqs           =

Modified: trunk/data/trident/tiles.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/trident/tiles.spec?rev=31523&r1=31522&r2=31523&view=diff
==============================================================================
--- trunk/data/trident/tiles.spec       (original)
+++ trunk/data/trident/tiles.spec       Thu Jan 21 11:27:00 2016
@@ -590,7 +590,7 @@
   7, 18, "unit.sentry"
   7, 19, "unit.patrol"
 
-  8, 16, "unit.mine"
+  8, 16, "unit.plant"
   8, 17, "unit.irrigate"
   8, 18, "unit.transform"
   8, 19, "unit.pillage"


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to