[Freeciv-commits] r27465 - in /branches: S2_4/po/fr.po S2_5/translations/freeciv/fr.po
Author: igx31 Date: Wed Dec 31 21:02:30 2014 New Revision: 27465 URL: http://svn.gna.org/viewcvs/freeciv?rev=27465&view=rev Log: Commit of updated French translations before 2.6 branching even though trunk doesn't seem changed :-/ Modified: branches/S2_4/po/fr.po branches/S2_5/translations/freeciv/fr.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_4/po/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/fr.po?rev=27465&r1=27464&r2=27465&view=diff Modified: branches/S2_5/translations/freeciv/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/fr.po?rev=27465&r1=27464&r2=27465&view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27464 - /trunk/ai/default/advdomestic.c
Author: sveinung
Date: Wed Dec 31 15:05:45 2014
New Revision: 27464
URL: http://svn.gna.org/viewcvs/freeciv?rev=27464&view=rev
Log:
AI: Ask for a help wonder unit when calculating wonder city distance
Ask directly for a unit that can help build a wonder in stead of asking for
a unit with the HelpWonder unit type flag and then checking if it can build
a wonder.
See patch #5631
Modified:
trunk/ai/default/advdomestic.c
Modified: trunk/ai/default/advdomestic.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/advdomestic.c?rev=27464&r1=27463&r2=27464&view=diff
==
--- trunk/ai/default/advdomestic.c (original)
+++ trunk/ai/default/advdomestic.c Wed Dec 31 15:05:45 2014
@@ -574,16 +574,15 @@
return;
}
- punittype = best_role_unit_for_player(pplayer, UTYF_HELP_WONDER);
+ punittype = best_role_unit_for_player(pplayer,
+ action_get_role(ACTION_HELP_WONDER));
if (!punittype) {
return;
}
- if (!utype_can_do_action(punittype, ACTION_HELP_WONDER)) {
-/* This unit type isn't suitable for wonder building help. */
-return;
- }
+ fc_assert_msg(utype_can_do_action(punittype, ACTION_HELP_WONDER),
+"Non existence of wonder helper unit not caught");
ghost = unit_virtual_create(pplayer, wonder_city, punittype, 0);
maxrange = unit_move_rate(ghost) * 7;
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27463 - /trunk/client/gui-qt/menu.cpp
Author: mir3x
Date: Wed Dec 31 14:22:49 2014
New Revision: 27463
URL: http://svn.gna.org/viewcvs/freeciv?rev=27463&view=rev
Log:
Added ability to build wonder from menu to qt-client.
Patch by Sveinung Kvilhaugsvik .
See bug #23100
Modified:
trunk/client/gui-qt/menu.cpp
Modified: trunk/client/gui-qt/menu.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=27463&r1=27462&r2=27463&view=diff
==
--- trunk/client/gui-qt/menu.cpp(original)
+++ trunk/client/gui-qt/menu.cppWed Dec 31 14:22:49 2014
@@ -618,6 +618,7 @@
act = menu->addAction(_("Clean Nuclear Fallout"));
menu_list.insertMulti(FALLOUT, act);
act->setShortcut(QKeySequence(tr("n")));
+ connect(act, SIGNAL(triggered()), this, SLOT(slot_clean_fallout()));
act = menu->addAction(_("Help build Wonder"));
act->setShortcut(QKeySequence(tr("b")));
menu_list.insertMulti(BUILD_WONDER, act);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27462 - /branches/S2_5/client/gui-qt/menu.cpp
Author: mir3x
Date: Wed Dec 31 14:22:31 2014
New Revision: 27462
URL: http://svn.gna.org/viewcvs/freeciv?rev=27462&view=rev
Log:
Added ability to build wonder from menu to qt-client.
Patch by Sveinung Kvilhaugsvik .
See bug #23100
Modified:
branches/S2_5/client/gui-qt/menu.cpp
Modified: branches/S2_5/client/gui-qt/menu.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/menu.cpp?rev=27462&r1=27461&r2=27462&view=diff
==
--- branches/S2_5/client/gui-qt/menu.cpp(original)
+++ branches/S2_5/client/gui-qt/menu.cppWed Dec 31 14:22:31 2014
@@ -618,6 +618,10 @@
menu_list.insertMulti(FALLOUT, act);
act->setShortcut(QKeySequence(tr("n")));
connect(act, SIGNAL(triggered()), this, SLOT(slot_clean_fallout()));
+ act = menu->addAction(_("Help build Wonder"));
+ act->setShortcut(QKeySequence(tr("b")));
+ menu_list.insertMulti(BUILD_WONDER, act);
+ connect(act, SIGNAL(triggered()), this, SLOT(slot_build_city()));
/* Civilization menu */
menu = this->addMenu(_("Civilization"));
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27461 - in /trunk/server: diplomats.c diplomats.h unithand.c
Author: sveinung
Date: Wed Dec 31 12:26:24 2014
New Revision: 27461
URL: http://svn.gna.org/viewcvs/freeciv?rev=27461&view=rev
Log:
Send the correct action to maybe_cause_incident()
in stead of always sending the untargeted version. They are still handled
the same way.
See patch #5630
Modified:
trunk/server/diplomats.c
trunk/server/diplomats.h
trunk/server/unithand.c
Modified: trunk/server/diplomats.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/diplomats.c?rev=27461&r1=27460&r2=27461&view=diff
==
--- trunk/server/diplomats.c(original)
+++ trunk/server/diplomats.cWed Dec 31 12:26:24 2014
@@ -549,7 +549,8 @@
not at war with
/
void diplomat_get_tech(struct player *pplayer, struct unit *pdiplomat,
- struct city *pcity, Tech_type_id technology)
+ struct city *pcity, Tech_type_id technology,
+ const enum gen_action action_id)
{
struct research *presearch, *cresearch;
struct player *cplayer;
@@ -658,7 +659,7 @@
unit_tile_link(pdiplomat),
city_link(pcity));
/* this may cause a diplomatic incident */
-maybe_cause_incident(ACTION_SPY_STEAL_TECH, pplayer, cplayer,
+maybe_cause_incident(action_id, pplayer, cplayer,
city_tile(pcity), city_link(pcity));
wipe_unit(pdiplomat, ULR_CAUGHT, cplayer);
return;
@@ -683,7 +684,7 @@
(pcity->server.steal)++;
/* this may cause a diplomatic incident */
- maybe_cause_incident(ACTION_SPY_STEAL_TECH, pplayer, cplayer,
+ maybe_cause_incident(action_id, pplayer, cplayer,
city_tile(pcity), city_link(pcity));
/* Check if a spy survives her mission. Diplomats never do. */
@@ -830,7 +831,8 @@
- The saboteur may be captured and executed, or escape to its home town.
**/
void diplomat_sabotage(struct player *pplayer, struct unit *pdiplomat,
- struct city *pcity, Impr_type_id improvement)
+ struct city *pcity, Impr_type_id improvement,
+ const enum gen_action action_id)
{
struct player *cplayer;
struct impr_type *ptarget;
@@ -1069,7 +1071,7 @@
send_city_info(NULL, pcity);
/* this may cause a diplomatic incident */
- maybe_cause_incident(ACTION_SPY_SABOTAGE_CITY, pplayer, cplayer,
+ maybe_cause_incident(action_id, pplayer, cplayer,
city_tile(pcity), city_link(pcity));
/* Check if a spy survives her mission. Diplomats never do. */
Modified: trunk/server/diplomats.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/diplomats.h?rev=27461&r1=27460&r2=27461&view=diff
==
--- trunk/server/diplomats.h(original)
+++ trunk/server/diplomats.hWed Dec 31 12:26:24 2014
@@ -28,11 +28,13 @@
void diplomat_bribe(struct player *pplayer, struct unit *pdiplomat,
struct unit *pvictim);
void diplomat_get_tech(struct player *pplayer, struct unit *pdiplomat,
- struct city *pcity, int technology);
+ struct city *pcity, int technology,
+ const enum gen_action action_id);
void diplomat_incite(struct player *pplayer, struct unit *pdiplomat,
struct city *pcity);
-void diplomat_sabotage(struct player *pplayer, struct unit *pdiplomat,
- struct city *pcity, Impr_type_id improvement);
+void diplomat_sabotage(struct player *pplayer, struct unit *pdiplomat,
+ struct city *pcity, Impr_type_id improvement,
+ const enum gen_action action_id);
void spy_steal_gold(struct player *act_player, struct unit *act_unit,
struct city *tgt_city);
Modified: trunk/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=27461&r1=27460&r2=27461&view=diff
==
--- trunk/server/unithand.c (original)
+++ trunk/server/unithand.c Wed Dec 31 12:26:24 2014
@@ -702,7 +702,8 @@
if (is_action_enabled_unit_on_city(action_type, actor_unit, pcity)) {
ACTION_STARTED_UNIT_CITY(action_type, actor_unit, pcity);
-diplomat_sabotage(pplayer, actor_unit, pcity, B_LAST);
+diplomat_sabotage(pplayer, actor_unit, pcity, B_LAST,
+ action_type);
} else {
illegal_action(pplayer, actor_unit, action_type,
city_owner(pcity));
@@ -715,7 +716,8 @@
ACTION_STARTED_UNIT_CITY(action_type, actor_unit, pcity);
/* packet value is improvement ID + 1 (or some special codes) */
-diplomat_sabotage(ppl
[Freeciv-commits] r27460 - in /trunk/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/
Author: sveinung
Date: Wed Dec 31 12:26:02 2014
New Revision: 27460
URL: http://svn.gna.org/viewcvs/freeciv?rev=27460&view=rev
Log:
Rulesets: Remove custom UI name of unused actions.
Don't define a custom UI name in bundled rulesets for an action unless the
action is possible in the ruleset.
See patch #5628
Modified:
trunk/data/alien/game.ruleset
trunk/data/civ1/game.ruleset
trunk/data/civ2/game.ruleset
trunk/data/civ2civ3/game.ruleset
trunk/data/classic/game.ruleset
trunk/data/experimental/game.ruleset
trunk/data/multiplayer/game.ruleset
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=27460&r1=27459&r2=27460&view=diff
==
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Wed Dec 31 12:26:02 2014
@@ -174,18 +174,12 @@
; /* TRANS: _Poison City (3% chance of success). */
ui_name_posion_city = _("%sPoison City%s")
-; /* TRANS: _Sabotage Enemy Unit (3% chance of success). */
-ui_name_sabotage_unit = _("%sSabotage Enemy Unit%s")
-
; /* TRANS: _Bribe Enemy Unit (3% chance of success). */
ui_name_bribe_unit = _("%sBribe Enemy Unit%s")
; /* TRANS: _Sabotage City (3% chance of success). */
ui_name_sabotage_city = _("%sSabotage City%s")
-; /* TRANS: Industria_l Sabotage (3% chance of success). */
-ui_name_targeted_sabotage_city = _("Industria%sl Sabotage%s")
-
; /* TRANS: Incite a _Revolt (3% chance of success). */
ui_name_incite_city = _("Incite a %sRevolt%s")
@@ -195,14 +189,8 @@
; /* TRANS: Steal _Technology (3% chance of success). */
ui_name_steal_tech = _("Steal %sTechnology%s")
-; /* TRANS: In_dustrial Espionage (3% chance of success). */
-ui_name_targeted_steal_tech = _("In%sdustrial Espionage%s")
-
; /* TRANS: _Investigate City (100% chance of success). */
ui_name_investigate_city = _("%sInvestigate City%s")
-
-; /* TRANS: Steal _Gold (100% chance of success). */
-ui_name_steal_gold = _("Steal %sGold%s")
; /* TRANS: Establish Trade _Route (100% chance of success). */
ui_name_establish_trade_route = _("Establish Trade %sRoute%s")
Modified: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=27460&r1=27459&r2=27460&view=diff
==
--- trunk/data/civ1/game.ruleset(original)
+++ trunk/data/civ1/game.rulesetWed Dec 31 12:26:02 2014
@@ -160,18 +160,12 @@
; /* TRANS: _Poison City (3% chance of success). */
ui_name_posion_city = _("%sPoison City%s")
-; /* TRANS: _Sabotage Enemy Unit (3% chance of success). */
-ui_name_sabotage_unit = _("%sSabotage Enemy Unit%s")
-
; /* TRANS: _Bribe Enemy Unit (3% chance of success). */
ui_name_bribe_unit = _("%sBribe Enemy Unit%s")
; /* TRANS: _Sabotage City (3% chance of success). */
ui_name_sabotage_city = _("%sSabotage City%s")
-; /* TRANS: Industria_l Sabotage (3% chance of success). */
-ui_name_targeted_sabotage_city = _("Industria%sl Sabotage%s")
-
; /* TRANS: Incite a _Revolt (3% chance of success). */
ui_name_incite_city = _("Incite a %sRevolt%s")
@@ -181,14 +175,8 @@
; /* TRANS: Steal _Technology (3% chance of success). */
ui_name_steal_tech = _("Steal %sTechnology%s")
-; /* TRANS: In_dustrial Espionage (3% chance of success). */
-ui_name_targeted_steal_tech = _("In%sdustrial Espionage%s")
-
; /* TRANS: _Investigate City (100% chance of success). */
ui_name_investigate_city = _("%sInvestigate City%s")
-
-; /* TRANS: Steal _Gold (100% chance of success). */
-ui_name_steal_gold = _("Steal %sGold%s")
; /* TRANS: Establish Trade _Route (100% chance of success). */
ui_name_establish_trade_route = _("Establish Trade %sRoute%s")
Modified: trunk/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=27460&r1=27459&r2=27460&view=diff
==
--- trunk/data/civ2/game.ruleset(original)
+++ trunk/data/civ2/game.rulesetWed Dec 31 12:26:02 2014
@@ -180,9 +180,6 @@
; /* TRANS: _Investigate City (100% chance of success). */
ui_name_investigate_city = _("%sInvestigate City%s")
-
-; /* TRANS: Steal _Gold (100% chance of success). */
-ui_name_steal_gold = _("Steal %sGold%s")
; /* TRANS: Establish Trade _Route (100% chance of success). */
ui_name_establish_trade_route = _("Establish Trade %sRoute%s")
Modified: trunk/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=27460&r1=27459&r2=27460&view=diff
==
--- trunk/data/civ2civ3/game.ruleset(original)
+++ trunk/data/civ2civ3/game.rulesetWed Dec 31 12:26:02 2014
@@ -213,9 +213,6 @@
; /* TRANS: _Investigate City (100% chance of success). */
ui_name_investigate_city = _("
[Freeciv-commits] r27459 - /trunk/ai/default/advdomestic.c
Author: sveinung
Date: Wed Dec 31 12:25:36 2014
New Revision: 27459
URL: http://svn.gna.org/viewcvs/freeciv?rev=27459&view=rev
Log:
AI: Request a unit that can help wonder when considering to build a unit.
Ask directly for a unit that can help build a wonder in stead of asking for
a unit with the HelpWonder unit type flag and then checking if it can help
build a wonder.
See patch #5626
Modified:
trunk/ai/default/advdomestic.c
Modified: trunk/ai/default/advdomestic.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/advdomestic.c?rev=27459&r1=27458&r2=27459&view=diff
==
--- trunk/ai/default/advdomestic.c (original)
+++ trunk/ai/default/advdomestic.c Wed Dec 31 12:25:36 2014
@@ -85,7 +85,7 @@
struct unit_type *unit_type;
struct city *wonder_city = game_city_by_number(ai->wonder_city);
- if (num_role_units(UTYF_HELP_WONDER) == 0) {
+ if (num_role_units(action_get_role(ACTION_HELP_WONDER)) == 0) {
/* No such units available in the ruleset */
return;
}
@@ -117,18 +117,16 @@
}
} city_list_iterate_end;
- unit_type = best_role_unit(pcity, UTYF_HELP_WONDER);
+ unit_type = best_role_unit(pcity, action_get_role(ACTION_HELP_WONDER));
if (!unit_type) {
/* We cannot build such units yet
* but we will consider it to stimulate science */
-unit_type = get_role_unit(UTYF_HELP_WONDER, 0);
- }
-
- if (!utype_can_do_action(unit_type, ACTION_HELP_WONDER)) {
-/* This unit type isn't suitable for wonder building help. */
-return;
- }
+unit_type = get_role_unit(action_get_role(ACTION_HELP_WONDER), 0);
+ }
+
+ fc_assert_msg(utype_can_do_action(unit_type, ACTION_HELP_WONDER),
+"Non existence of wonder helper unit not caught");
/* Check if wonder needs a little help. */
if (build_points_left(wonder_city)
@@ -148,14 +146,17 @@
if (want > choice->want) {
/* This sets our tech want in cases where we cannot actually build
* the unit. */
- unit_type = dai_wants_role_unit(ait, pplayer, pcity, UTYF_HELP_WONDER,
want);
+ unit_type = dai_wants_role_unit(ait, pplayer, pcity,
+ action_get_role(ACTION_HELP_WONDER),
+ want);
if (unit_type != NULL) {
choice->want = want;
choice->type = CT_CIVILIAN;
choice->value.utype = unit_type;
} else {
CITY_LOG(LOG_DEBUG, pcity,
- "would but could not build UTYF_HELP_WONDER unit, bumped
reqs");
+ "would but could not build ACTION_HELP_WONDER unit, "
+ "bumped reqs");
}
}
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27458 - in /trunk: ./ ai/default/ common/ data/alien/ data/civ1/ data/civ2/ data/civ2civ3/ data/classic/ data/experimental/...
Author: sveinung
Date: Wed Dec 31 11:55:37 2014
New Revision: 27458
URL: http://svn.gna.org/viewcvs/freeciv?rev=27458&view=rev
Log:
Unhard code the move fragment cost of trying to do an illegal action.
Introduce the new effect Illegal_Action_Move_Cost. It controls the number of
move fragment lost when the player tries to do an action that is illegal.
See patch #5629
Modified:
trunk/ai/default/daieffects.c
trunk/common/effects.h
trunk/data/alien/effects.ruleset
trunk/data/civ1/effects.ruleset
trunk/data/civ2/effects.ruleset
trunk/data/civ2civ3/effects.ruleset
trunk/data/classic/effects.ruleset
trunk/data/experimental/effects.ruleset
trunk/data/multiplayer/effects.ruleset
trunk/doc/README.effects
trunk/fc_version
trunk/server/unithand.c
Modified: trunk/ai/default/daieffects.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/daieffects.c?rev=27458&r1=27457&r2=27458&view=diff
==
--- trunk/ai/default/daieffects.c (original)
+++ trunk/ai/default/daieffects.c Wed Dec 31 11:55:37 2014
@@ -512,6 +512,7 @@
case EFT_HISTORY:
case EFT_NATION_PERFORMANCE:
case EFT_NATION_HISTORY:
+ case EFT_ILLEGAL_ACTION_MOVE_COST:
break;
/* This has no effect for AI */
case EFT_VISIBLE_WALLS:
Modified: trunk/common/effects.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/effects.h?rev=27458&r1=27457&r2=27458&view=diff
==
--- trunk/common/effects.h (original)
+++ trunk/common/effects.h Wed Dec 31 11:55:37 2014
@@ -271,6 +271,8 @@
#define SPECENUM_VALUE104NAME "Thiefs_Share_Pct"
#define SPECENUM_VALUE105 EFT_RETIRE_PCT
#define SPECENUM_VALUE105NAME "Retire_Pct"
+#define SPECENUM_VALUE106 EFT_ILLEGAL_ACTION_MOVE_COST
+#define SPECENUM_VALUE106NAME "Illegal_Action_Move_Cost"
/* keep this last */
#define SPECENUM_COUNT EFT_COUNT
#include "specenum_gen.h"
Modified: trunk/data/alien/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/effects.ruleset?rev=27458&r1=27457&r2=27458&view=diff
==
--- trunk/data/alien/effects.ruleset(original)
+++ trunk/data/alien/effects.rulesetWed Dec 31 11:55:37 2014
@@ -1025,3 +1025,7 @@
{ "type", "name", "range"
"UnitFlag", "Cities", "Local"
}
+
+[effect_illegal_action_move_cost_base]
+type = "Illegal_Action_Move_Cost"
+value = 1
Modified: trunk/data/civ1/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/effects.ruleset?rev=27458&r1=27457&r2=27458&view=diff
==
--- trunk/data/civ1/effects.ruleset (original)
+++ trunk/data/civ1/effects.ruleset Wed Dec 31 11:55:37 2014
@@ -1435,3 +1435,7 @@
{ "type", "name", "range"
"UnitFlag", "Cities", "Local"
}
+
+[effect_illegal_action_move_cost_base]
+type = "Illegal_Action_Move_Cost"
+value = 1
Modified: trunk/data/civ2/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/effects.ruleset?rev=27458&r1=27457&r2=27458&view=diff
==
--- trunk/data/civ2/effects.ruleset (original)
+++ trunk/data/civ2/effects.ruleset Wed Dec 31 11:55:37 2014
@@ -2274,3 +2274,7 @@
{ "type", "name", "range"
"UnitFlag", "Cities", "Local"
}
+
+[effect_illegal_action_move_cost_base]
+type = "Illegal_Action_Move_Cost"
+value = 1
Modified: trunk/data/civ2civ3/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=27458&r1=27457&r2=27458&view=diff
==
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Wed Dec 31 11:55:37 2014
@@ -3716,3 +3716,7 @@
{ "type", "name", "range"
"UnitFlag", "Cities", "Local"
}
+
+[effect_illegal_action_move_cost_base]
+type = "Illegal_Action_Move_Cost"
+value = 1
Modified: trunk/data/classic/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/effects.ruleset?rev=27458&r1=27457&r2=27458&view=diff
==
--- trunk/data/classic/effects.ruleset (original)
+++ trunk/data/classic/effects.ruleset Wed Dec 31 11:55:37 2014
@@ -2364,3 +2364,7 @@
{ "type", "name", "range"
"UnitFlag", "Cities", "Local"
}
+
+[effect_illegal_action_move_cost_base]
+type = "Illegal_Action_Move_Cost"
+value = 1
Modified: trunk/data/experimental/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/effects.ruleset?rev=27458&r1=27457&r2=27458&view=diff
==
--- trunk/data/experimen
[Freeciv-commits] r27457 - in /trunk: ./ client/ common/ data/alien/ data/civ1/ data/civ2/ data/civ2civ3/ data/classic/ data/experimental/ dat...
Author: sveinung
Date: Wed Dec 31 11:13:42 2014
New Revision: 27457
URL: http://svn.gna.org/viewcvs/freeciv?rev=27457&view=rev
Log:
Move the TradeRoute unit type flag to the ruleset.
See patch #5624
Modified:
trunk/client/helpdata.c
trunk/common/unittype.h
trunk/data/alien/units.ruleset
trunk/data/civ1/units.ruleset
trunk/data/civ2/units.ruleset
trunk/data/civ2civ3/units.ruleset
trunk/data/classic/units.ruleset
trunk/data/experimental/units.ruleset
trunk/data/multiplayer/units.ruleset
trunk/data/stub/units.ruleset
trunk/fc_version
Modified: trunk/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=27457&r1=27456&r2=27457&view=diff
==
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Wed Dec 31 11:13:42 2014
@@ -3603,10 +3603,6 @@
astr_free(&dlist);
}
}
- if (utype_has_flag(utype, UTYF_TRADE_ROUTE)) {
-CATLSTR(buf, bufsz,
-_("* Can establish trade routes (must travel to target city).\n"));
- }
if (utype_has_flag(utype, UTYF_HELP_WONDER)) {
cat_snprintf(buf, bufsz,
_("* Can help build wonders (adds %d production).\n"),
Modified: trunk/common/unittype.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.h?rev=27457&r1=27456&r2=27457&view=diff
==
--- trunk/common/unittype.h (original)
+++ trunk/common/unittype.h Wed Dec 31 11:13:42 2014
@@ -137,8 +137,9 @@
* Used in the network protocol.
*/
#define SPECENUM_NAME unit_type_flag_id
-#define SPECENUM_VALUE0 UTYF_TRADE_ROUTE
-#define SPECENUM_VALUE0NAME N_("TradeRoute")
+/* Cannot fortify even if class can */
+#define SPECENUM_VALUE0 UTYF_CANT_FORTIFY
+#define SPECENUM_VALUE0NAME N_("Cant_Fortify")
#define SPECENUM_VALUE1 UTYF_HELP_WONDER
#define SPECENUM_VALUE1NAME N_("HelpWonder")
#define SPECENUM_VALUE2 UTYF_IGZOC
@@ -233,42 +234,39 @@
/* Unit has no ZOC */
#define SPECENUM_VALUE34 UTYF_NOZOC
#define SPECENUM_VALUE34NAME N_("HasNoZOC")
-/* Cannot fortify even if class can */
-#define SPECENUM_VALUE35 UTYF_CANT_FORTIFY
-#define SPECENUM_VALUE35NAME N_("Cant_Fortify")
-
-#define SPECENUM_VALUE36 UTYF_USER_FLAG_1
-#define SPECENUM_VALUE37 UTYF_USER_FLAG_2
-#define SPECENUM_VALUE38 UTYF_USER_FLAG_3
-#define SPECENUM_VALUE39 UTYF_USER_FLAG_4
-#define SPECENUM_VALUE40 UTYF_USER_FLAG_5
-#define SPECENUM_VALUE41 UTYF_USER_FLAG_6
-#define SPECENUM_VALUE42 UTYF_USER_FLAG_7
-#define SPECENUM_VALUE43 UTYF_USER_FLAG_8
-#define SPECENUM_VALUE44 UTYF_USER_FLAG_9
-#define SPECENUM_VALUE45 UTYF_USER_FLAG_10
-#define SPECENUM_VALUE46 UTYF_USER_FLAG_11
-#define SPECENUM_VALUE47 UTYF_USER_FLAG_12
-#define SPECENUM_VALUE48 UTYF_USER_FLAG_13
-#define SPECENUM_VALUE49 UTYF_USER_FLAG_14
-#define SPECENUM_VALUE50 UTYF_USER_FLAG_15
-#define SPECENUM_VALUE51 UTYF_USER_FLAG_16
-#define SPECENUM_VALUE52 UTYF_USER_FLAG_17
-#define SPECENUM_VALUE53 UTYF_USER_FLAG_18
-#define SPECENUM_VALUE54 UTYF_USER_FLAG_19
-#define SPECENUM_VALUE55 UTYF_USER_FLAG_20
-#define SPECENUM_VALUE56 UTYF_USER_FLAG_21
-#define SPECENUM_VALUE57 UTYF_USER_FLAG_22
-#define SPECENUM_VALUE58 UTYF_USER_FLAG_23
-#define SPECENUM_VALUE59 UTYF_USER_FLAG_24
-#define SPECENUM_VALUE60 UTYF_USER_FLAG_25
-#define SPECENUM_VALUE61 UTYF_USER_FLAG_26
-#define SPECENUM_VALUE62 UTYF_USER_FLAG_27
-#define SPECENUM_VALUE63 UTYF_USER_FLAG_28
-#define SPECENUM_VALUE64 UTYF_USER_FLAG_29
-#define SPECENUM_VALUE65 UTYF_USER_FLAG_30
-#define SPECENUM_VALUE66 UTYF_USER_FLAG_31
-#define SPECENUM_VALUE67 UTYF_USER_FLAG_32
+
+#define SPECENUM_VALUE35 UTYF_USER_FLAG_1
+#define SPECENUM_VALUE36 UTYF_USER_FLAG_2
+#define SPECENUM_VALUE37 UTYF_USER_FLAG_3
+#define SPECENUM_VALUE38 UTYF_USER_FLAG_4
+#define SPECENUM_VALUE39 UTYF_USER_FLAG_5
+#define SPECENUM_VALUE40 UTYF_USER_FLAG_6
+#define SPECENUM_VALUE41 UTYF_USER_FLAG_7
+#define SPECENUM_VALUE42 UTYF_USER_FLAG_8
+#define SPECENUM_VALUE43 UTYF_USER_FLAG_9
+#define SPECENUM_VALUE44 UTYF_USER_FLAG_10
+#define SPECENUM_VALUE45 UTYF_USER_FLAG_11
+#define SPECENUM_VALUE46 UTYF_USER_FLAG_12
+#define SPECENUM_VALUE47 UTYF_USER_FLAG_13
+#define SPECENUM_VALUE48 UTYF_USER_FLAG_14
+#define SPECENUM_VALUE49 UTYF_USER_FLAG_15
+#define SPECENUM_VALUE50 UTYF_USER_FLAG_16
+#define SPECENUM_VALUE51 UTYF_USER_FLAG_17
+#define SPECENUM_VALUE52 UTYF_USER_FLAG_18
+#define SPECENUM_VALUE53 UTYF_USER_FLAG_19
+#define SPECENUM_VALUE54 UTYF_USER_FLAG_20
+#define SPECENUM_VALUE55 UTYF_USER_FLAG_21
+#define SPECENUM_VALUE56 UTYF_USER_FLAG_22
+#define SPECENUM_VALUE57 UTYF_USER_FLAG_23
+#define SPECENUM_VALUE58 UTYF_USER_FLAG_24
+#define SPECENUM_VALUE59 UTYF_USER_FLAG_25
+#define SPECENUM_VALUE60 UTYF_USER_FLAG_26
+#define SPECENUM_VALUE61 UTYF_USER_FLAG_27
+#define SPECENUM_VALUE62 UTYF_USER_FLAG_28
+#define SPECENUM_VALUE63 UTYF_USER_FLAG_29
+#define SPECENUM_VALUE64 UTYF_USE
