[Freeciv-commits] r27720 - in /branches/S2_5/data: graphics/wonders/ misc/ wonders/
Author: cazfi Date: Mon Jan 19 04:32:49 2015 New Revision: 27720 URL: http://svn.gna.org/viewcvs/freeciv?rev=27720view=rev Log: Added graphics for Temple of Artemis and Mausoleum of Halicarnassus to wonders-large. See bug #20030 Added: branches/S2_5/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg (with props) branches/S2_5/data/graphics/wonders/Temple_of_Artemis.jpg (with props) branches/S2_5/data/wonders/mausoleum_of_halicarnassus.png (with props) branches/S2_5/data/wonders/temple_of_artemis.png (with props) Modified: branches/S2_5/data/misc/wonders-large.spec branches/S2_5/data/wonders/Makefile.am Added: branches/S2_5/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg?rev=27720view=auto == Binary file - no diff available. Propchange: branches/S2_5/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg -- svn:mime-type = application/octet-stream Added: branches/S2_5/data/graphics/wonders/Temple_of_Artemis.jpg URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/graphics/wonders/Temple_of_Artemis.jpg?rev=27720view=auto == Binary file - no diff available. Propchange: branches/S2_5/data/graphics/wonders/Temple_of_Artemis.jpg -- svn:mime-type = application/octet-stream Modified: branches/S2_5/data/misc/wonders-large.spec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/misc/wonders-large.spec?rev=27720r1=27719r2=27720view=diff == --- branches/S2_5/data/misc/wonders-large.spec (original) +++ branches/S2_5/data/misc/wonders-large.spec Mon Jan 19 04:32:49 2015 @@ -50,6 +50,8 @@ b.oracle b.statue_of_liberty b.statue_of_zeus + b.temple_of_artemis + b.mausoleum [extra] @@ -74,6 +76,7 @@ b.magellans_expedition, wonders/magellans_expedition b.manhattan_project, wonders/manhattan_project b.marco_polos_embassy, wonders/marco_polos_embassy +b.mausoleum, wonders/mausoleum_of_halicarnassus b.michelangelos_chapel, wonders/michelangelos_chapel b.oracle, wonders/oracle b.pyramids, wonders/pyramids @@ -82,6 +85,7 @@ b.statue_of_liberty, wonders/statue_of_liberty b.statue_of_zeus, wonders/statue_of_zeus b.sun_tzus_war_academy, wonders/sun_tzus_war_academy +b.temple_of_artemis, wonders/temple_of_artemis b.united_nations, wonders/united_nations b.womens_suffrage, wonders/womens_suffrage } Modified: branches/S2_5/data/wonders/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/wonders/Makefile.am?rev=27720r1=27719r2=27720view=diff == --- branches/S2_5/data/wonders/Makefile.am (original) +++ branches/S2_5/data/wonders/Makefile.am Mon Jan 19 04:32:49 2015 @@ -23,6 +23,7 @@ magellans_expedition.png\ manhattan_project.png \ marco_polos_embassy.png \ + mausoleum_of_halicarnassus.png \ michelangelos_chapel.png\ oracle.png \ pyramids.png\ @@ -31,6 +32,7 @@ statue_of_liberty.png \ statue_of_zeus.png \ sun_tzus_war_academy.png\ + temple_of_artemis.png \ united_nations.png \ womens_suffrage.png Added: branches/S2_5/data/wonders/mausoleum_of_halicarnassus.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/wonders/mausoleum_of_halicarnassus.png?rev=27720view=auto == Binary file - no diff available. Propchange: branches/S2_5/data/wonders/mausoleum_of_halicarnassus.png -- svn:mime-type = application/octet-stream Added: branches/S2_5/data/wonders/temple_of_artemis.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/wonders/temple_of_artemis.png?rev=27720view=auto == Binary file - no diff available. Propchange: branches/S2_5/data/wonders/temple_of_artemis.png -- svn:mime-type = application/octet-stream ___ Freeciv-commits mailing list
[Freeciv-commits] r27719 - in /branches/S2_6/data: graphics/wonders/ misc/ wonders/
Author: cazfi Date: Mon Jan 19 04:32:20 2015 New Revision: 27719 URL: http://svn.gna.org/viewcvs/freeciv?rev=27719view=rev Log: Added graphics for Temple of Artemis and Mausoleum of Halicarnassus to wonders-large. See bug #20030 Added: branches/S2_6/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg (with props) branches/S2_6/data/graphics/wonders/Temple_of_Artemis.jpg (with props) branches/S2_6/data/wonders/mausoleum_of_halicarnassus.png (with props) branches/S2_6/data/wonders/temple_of_artemis.png (with props) Modified: branches/S2_6/data/misc/wonders-large.spec branches/S2_6/data/wonders/Makefile.am Added: branches/S2_6/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg?rev=27719view=auto == Binary file - no diff available. Propchange: branches/S2_6/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg -- svn:mime-type = application/octet-stream Added: branches/S2_6/data/graphics/wonders/Temple_of_Artemis.jpg URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/graphics/wonders/Temple_of_Artemis.jpg?rev=27719view=auto == Binary file - no diff available. Propchange: branches/S2_6/data/graphics/wonders/Temple_of_Artemis.jpg -- svn:mime-type = application/octet-stream Modified: branches/S2_6/data/misc/wonders-large.spec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/misc/wonders-large.spec?rev=27719r1=27718r2=27719view=diff == --- branches/S2_6/data/misc/wonders-large.spec (original) +++ branches/S2_6/data/misc/wonders-large.spec Mon Jan 19 04:32:20 2015 @@ -50,6 +50,8 @@ b.oracle b.statue_of_liberty b.statue_of_zeus + b.temple_of_artemis + b.mausoleum [extra] @@ -74,6 +76,7 @@ b.magellans_expedition, wonders/magellans_expedition b.manhattan_project, wonders/manhattan_project b.marco_polos_embassy, wonders/marco_polos_embassy +b.mausoleum, wonders/mausoleum_of_halicarnassus b.michelangelos_chapel, wonders/michelangelos_chapel b.oracle, wonders/oracle b.pyramids, wonders/pyramids @@ -82,6 +85,7 @@ b.statue_of_liberty, wonders/statue_of_liberty b.statue_of_zeus, wonders/statue_of_zeus b.sun_tzus_war_academy, wonders/sun_tzus_war_academy +b.temple_of_artemis, wonders/temple_of_artemis b.united_nations, wonders/united_nations b.womens_suffrage, wonders/womens_suffrage } Modified: branches/S2_6/data/wonders/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/wonders/Makefile.am?rev=27719r1=27718r2=27719view=diff == --- branches/S2_6/data/wonders/Makefile.am (original) +++ branches/S2_6/data/wonders/Makefile.am Mon Jan 19 04:32:20 2015 @@ -23,6 +23,7 @@ magellans_expedition.png\ manhattan_project.png \ marco_polos_embassy.png \ + mausoleum_of_halicarnassus.png \ michelangelos_chapel.png\ oracle.png \ pyramids.png\ @@ -31,6 +32,7 @@ statue_of_liberty.png \ statue_of_zeus.png \ sun_tzus_war_academy.png\ + temple_of_artemis.png \ united_nations.png \ womens_suffrage.png Added: branches/S2_6/data/wonders/mausoleum_of_halicarnassus.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/wonders/mausoleum_of_halicarnassus.png?rev=27719view=auto == Binary file - no diff available. Propchange: branches/S2_6/data/wonders/mausoleum_of_halicarnassus.png -- svn:mime-type = application/octet-stream Added: branches/S2_6/data/wonders/temple_of_artemis.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/wonders/temple_of_artemis.png?rev=27719view=auto == Binary file - no diff available. Propchange: branches/S2_6/data/wonders/temple_of_artemis.png -- svn:mime-type = application/octet-stream ___ Freeciv-commits mailing list
[Freeciv-commits] r27718 - in /trunk/data: graphics/wonders/ misc/ wonders/
Author: cazfi Date: Mon Jan 19 04:31:49 2015 New Revision: 27718 URL: http://svn.gna.org/viewcvs/freeciv?rev=27718view=rev Log: Added graphics for Temple of Artemis and Mausoleum of Halicarnassus to wonders-large. See bug #20030 Added: trunk/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg (with props) trunk/data/graphics/wonders/Temple_of_Artemis.jpg (with props) trunk/data/wonders/mausoleum_of_halicarnassus.png (with props) trunk/data/wonders/temple_of_artemis.png (with props) Modified: trunk/data/misc/wonders-large.spec trunk/data/wonders/Makefile.am Added: trunk/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg?rev=27718view=auto == Binary file - no diff available. Propchange: trunk/data/graphics/wonders/Mausoleum_of_Halicarnassus.jpg -- svn:mime-type = application/octet-stream Added: trunk/data/graphics/wonders/Temple_of_Artemis.jpg URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/graphics/wonders/Temple_of_Artemis.jpg?rev=27718view=auto == Binary file - no diff available. Propchange: trunk/data/graphics/wonders/Temple_of_Artemis.jpg -- svn:mime-type = application/octet-stream Modified: trunk/data/misc/wonders-large.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/wonders-large.spec?rev=27718r1=27717r2=27718view=diff == --- trunk/data/misc/wonders-large.spec (original) +++ trunk/data/misc/wonders-large.spec Mon Jan 19 04:31:49 2015 @@ -50,6 +50,8 @@ b.oracle b.statue_of_liberty b.statue_of_zeus + b.temple_of_artemis + b.mausoleum [extra] @@ -74,6 +76,7 @@ b.magellans_expedition, wonders/magellans_expedition b.manhattan_project, wonders/manhattan_project b.marco_polos_embassy, wonders/marco_polos_embassy +b.mausoleum, wonders/mausoleum_of_halicarnassus b.michelangelos_chapel, wonders/michelangelos_chapel b.oracle, wonders/oracle b.pyramids, wonders/pyramids @@ -82,6 +85,7 @@ b.statue_of_liberty, wonders/statue_of_liberty b.statue_of_zeus, wonders/statue_of_zeus b.sun_tzus_war_academy, wonders/sun_tzus_war_academy +b.temple_of_artemis, wonders/temple_of_artemis b.united_nations, wonders/united_nations b.womens_suffrage, wonders/womens_suffrage } Modified: trunk/data/wonders/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/wonders/Makefile.am?rev=27718r1=27717r2=27718view=diff == --- trunk/data/wonders/Makefile.am (original) +++ trunk/data/wonders/Makefile.am Mon Jan 19 04:31:49 2015 @@ -23,6 +23,7 @@ magellans_expedition.png\ manhattan_project.png \ marco_polos_embassy.png \ + mausoleum_of_halicarnassus.png \ michelangelos_chapel.png\ oracle.png \ pyramids.png\ @@ -31,6 +32,7 @@ statue_of_liberty.png \ statue_of_zeus.png \ sun_tzus_war_academy.png\ + temple_of_artemis.png \ united_nations.png \ womens_suffrage.png Added: trunk/data/wonders/mausoleum_of_halicarnassus.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/wonders/mausoleum_of_halicarnassus.png?rev=27718view=auto == Binary file - no diff available. Propchange: trunk/data/wonders/mausoleum_of_halicarnassus.png -- svn:mime-type = application/octet-stream Added: trunk/data/wonders/temple_of_artemis.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/wonders/temple_of_artemis.png?rev=27718view=auto == Binary file - no diff available. Propchange: trunk/data/wonders/temple_of_artemis.png -- svn:mime-type = application/octet-stream ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27725 - in /branches/S2_6/server: ruleset.c ruleset.h srv_main.c
Author: cazfi
Date: Mon Jan 19 05:35:23 2015
New Revision: 27725
URL: http://svn.gna.org/viewcvs/freeciv?rev=27725view=rev
Log:
Free lua scripting state on server exit.
See bug #23174
Modified:
branches/S2_6/server/ruleset.c
branches/S2_6/server/ruleset.h
branches/S2_6/server/srv_main.c
Modified: branches/S2_6/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.c?rev=27725r1=27724r2=27725view=diff
==
--- branches/S2_6/server/ruleset.c (original)
+++ branches/S2_6/server/ruleset.c Mon Jan 19 05:35:23 2015
@@ -6586,6 +6586,15 @@
}
/**
+ Completely deinitialize ruleset system. Server is not in usable
+ state after this.
+**/
+void rulesets_deinit(void)
+{
+ script_server_free();
+}
+
+/**
Loads the rulesets from directory.
This may be called more than once and it will free any stale data.
**/
Modified: branches/S2_6/server/ruleset.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.h?rev=27725r1=27724r2=27725view=diff
==
--- branches/S2_6/server/ruleset.h (original)
+++ branches/S2_6/server/ruleset.h Mon Jan 19 05:35:23 2015
@@ -34,6 +34,8 @@
bool load_rulesets(const char *restore, bool act, bool buffer_script);
bool reload_rulesets_settings(void);
void send_rulesets(struct conn_list *dest);
+
+void rulesets_deinit(void);
void ruleset_error_real(const char *file, const char *function,
int line, enum log_level level,
Modified: branches/S2_6/server/srv_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=27725r1=27724r2=27725view=diff
==
--- branches/S2_6/server/srv_main.c (original)
+++ branches/S2_6/server/srv_main.c Mon Jan 19 05:35:23 2015
@@ -1533,6 +1533,7 @@
edithand_free();
voting_free();
close_connections_and_socket();
+ rulesets_deinit();
registry_module_close();
fc_destroy_mutex(game.server.mutexes.city_list);
free_nls();
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27727 - /trunk/server/advisors/autosettlers.c
Author: cazfi
Date: Mon Jan 19 06:03:55 2015
New Revision: 27727
URL: http://svn.gna.org/viewcvs/freeciv?rev=27727view=rev
Log:
Replaced separate iterations for roads and bases with one iteration over all
extras
when autosettlers evaluate what to build.
See patch #5713
Modified:
trunk/server/advisors/autosettlers.c
Modified: trunk/server/advisors/autosettlers.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/advisors/autosettlers.c?rev=27727r1=27726r2=27727view=diff
==
--- trunk/server/advisors/autosettlers.c(original)
+++ trunk/server/advisors/autosettlers.cMon Jan 19 06:03:55 2015
@@ -525,23 +525,43 @@
} /* endif: can the worker perform this action */
} as_transform_activity_iterate_end;
- road_type_iterate(proad) {
-struct extra_type *target = road_extra_get(proad);
-int base_value = adv_city_worker_extra_get(pcity, cindex, target);
+ extra_type_iterate(pextra) {
+enum unit_activity act = ACTIVITY_LAST;
+enum unit_activity eval_act = ACTIVITY_LAST;
+int base_value;
+
+as_extra_activity_iterate(try_act) {
+ if (is_extra_caused_by_action(pextra, try_act)) {
+eval_act = try_act;
+if (can_unit_do_activity_targeted_at(punit, try_act, pextra,
+ ptile)) {
+ act = try_act;
+ break;
+}
+ }
+} as_extra_activity_iterate_end;
+
+if (eval_act == ACTIVITY_LAST) {
+ /* No activity can provide the extra */
+ continue;
+}
+
+base_value = adv_city_worker_extra_get(pcity, cindex, pextra);
if (base_value = 0) {
int extra;
-
- time = pos.turn + get_turns_for_activity_at(punit,
- ACTIVITY_GEN_ROAD,
- ptile,
- target);
+ struct road_type *proad;
+
+ time = pos.turn + get_turns_for_activity_at(punit, eval_act,
+ ptile, pextra);
if (pos.moves_left == 0) {
/* We need moves left to begin activity immediately. */
time++;
}
- if (road_provides_move_bonus(proad)) {
+ proad = extra_road_get(pextra);
+
+ if (proad != NULL road_provides_move_bonus(proad)) {
int mc_multiplier = 1;
int mc_divisor = 1;
int old_move_cost = tile_terrain(ptile)-movement_cost *
SINGLE_MOVE;
@@ -574,18 +594,13 @@
extra = 0;
}
- if (can_unit_do_activity_targeted_at(punit, ACTIVITY_GEN_ROAD,
target,
- ptile)) {
-consider_settler_action(pplayer, ACTIVITY_GEN_ROAD, target,
extra, base_value,
+ if (act != ACTIVITY_LAST) {
+consider_settler_action(pplayer, ACTIVITY_GEN_ROAD, pextra,
extra, base_value,
oldv, in_use, time,
best_newv, best_oldv,
improve_worked,
best_delay, best_act, best_target,
best_tile, ptile);
} else {
-struct extra_type *pextra;
-
-pextra = road_extra_get(proad);
-
road_deps_iterate((pextra-reqs), pdep) {
struct extra_type *dep_tgt;
@@ -593,12 +608,12 @@
if (can_unit_do_activity_targeted_at(punit,
ACTIVITY_GEN_ROAD,
dep_tgt, ptile)) {
-/* Consider building dependency road for later upgrade to
target road.
+/* Consider building dependency road for later upgrade to
target extra.
* Here we set value to be sum of dependency
- * road and target road values, which increases want, and
time is sum
+ * road and target extra values, which increases want, and
time is sum
* of dependency and target build times, which decreases
want. This can
* result in either bigger or lesser want than when
checkin dependency
- * road for the sake of itself when its turn in
road_type_iterate() is. */
+ * road for the sake of itself when its turn in
extra_type_iterate() is. */
int dep_time = time + get_turns_for_activity_at(punit,
[Freeciv-commits] r27728 - /branches/S2_6/server/advisors/autosettlers.c
Author: cazfi
Date: Mon Jan 19 06:04:21 2015
New Revision: 27728
URL: http://svn.gna.org/viewcvs/freeciv?rev=27728view=rev
Log:
Replaced separate iterations for roads and bases with one iteration over all
extras
when autosettlers evaluate what to build.
See patch #5713
Modified:
branches/S2_6/server/advisors/autosettlers.c
Modified: branches/S2_6/server/advisors/autosettlers.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/advisors/autosettlers.c?rev=27728r1=27727r2=27728view=diff
==
--- branches/S2_6/server/advisors/autosettlers.c(original)
+++ branches/S2_6/server/advisors/autosettlers.cMon Jan 19 06:04:21 2015
@@ -525,23 +525,43 @@
} /* endif: can the worker perform this action */
} as_transform_activity_iterate_end;
- road_type_iterate(proad) {
-struct extra_type *target = road_extra_get(proad);
-int base_value = adv_city_worker_extra_get(pcity, cindex, target);
+ extra_type_iterate(pextra) {
+enum unit_activity act = ACTIVITY_LAST;
+enum unit_activity eval_act = ACTIVITY_LAST;
+int base_value;
+
+as_extra_activity_iterate(try_act) {
+ if (is_extra_caused_by_action(pextra, try_act)) {
+eval_act = try_act;
+if (can_unit_do_activity_targeted_at(punit, try_act, pextra,
+ ptile)) {
+ act = try_act;
+ break;
+}
+ }
+} as_extra_activity_iterate_end;
+
+if (eval_act == ACTIVITY_LAST) {
+ /* No activity can provide the extra */
+ continue;
+}
+
+base_value = adv_city_worker_extra_get(pcity, cindex, pextra);
if (base_value = 0) {
int extra;
-
- time = pos.turn + get_turns_for_activity_at(punit,
- ACTIVITY_GEN_ROAD,
- ptile,
- target);
+ struct road_type *proad;
+
+ time = pos.turn + get_turns_for_activity_at(punit, eval_act,
+ ptile, pextra);
if (pos.moves_left == 0) {
/* We need moves left to begin activity immediately. */
time++;
}
- if (road_provides_move_bonus(proad)) {
+ proad = extra_road_get(pextra);
+
+ if (proad != NULL road_provides_move_bonus(proad)) {
int mc_multiplier = 1;
int mc_divisor = 1;
int old_move_cost = tile_terrain(ptile)-movement_cost *
SINGLE_MOVE;
@@ -574,18 +594,13 @@
extra = 0;
}
- if (can_unit_do_activity_targeted_at(punit, ACTIVITY_GEN_ROAD,
target,
- ptile)) {
-consider_settler_action(pplayer, ACTIVITY_GEN_ROAD, target,
extra, base_value,
+ if (act != ACTIVITY_LAST) {
+consider_settler_action(pplayer, ACTIVITY_GEN_ROAD, pextra,
extra, base_value,
oldv, in_use, time,
best_newv, best_oldv,
improve_worked,
best_delay, best_act, best_target,
best_tile, ptile);
} else {
-struct extra_type *pextra;
-
-pextra = road_extra_get(proad);
-
road_deps_iterate((pextra-reqs), pdep) {
struct extra_type *dep_tgt;
@@ -593,12 +608,12 @@
if (can_unit_do_activity_targeted_at(punit,
ACTIVITY_GEN_ROAD,
dep_tgt, ptile)) {
-/* Consider building dependency road for later upgrade to
target road.
+/* Consider building dependency road for later upgrade to
target extra.
* Here we set value to be sum of dependency
- * road and target road values, which increases want, and
time is sum
+ * road and target extra values, which increases want, and
time is sum
* of dependency and target build times, which decreases
want. This can
* result in either bigger or lesser want than when
checkin dependency
- * road for the sake of itself when its turn in
road_type_iterate() is. */
+ * road for the sake of itself when its turn in
extra_type_iterate() is. */
int dep_time = time + get_turns_for_activity_at(punit,
[Freeciv-commits] r27717 - in /trunk/data/stub: nations.ruleset nations/barbarian.ruleset nations/pirate.ruleset
Author: cazfi
Date: Mon Jan 19 04:25:04 2015
New Revision: 27717
URL: http://svn.gna.org/viewcvs/freeciv?rev=27717view=rev
Log:
Stub ruleset has only one barbarian nation, of type LandAndSea
See patch #5672
Removed:
trunk/data/stub/nations/pirate.ruleset
Modified:
trunk/data/stub/nations.ruleset
trunk/data/stub/nations/barbarian.ruleset
Modified: trunk/data/stub/nations.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/nations.ruleset?rev=27717r1=27716r2=27717view=diff
==
--- trunk/data/stub/nations.ruleset (original)
+++ trunk/data/stub/nations.ruleset Mon Jan 19 04:25:04 2015
@@ -86,6 +86,5 @@
*include stub/nations/generic.ruleset
-; Must have two barbarian nations
+; Must have a barbarian nations
*include stub/nations/barbarian.ruleset
-*include stub/nations/pirate.ruleset
Modified: trunk/data/stub/nations/barbarian.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/nations/barbarian.ruleset?rev=27717r1=27716r2=27717view=diff
==
--- trunk/data/stub/nations/barbarian.ruleset (original)
+++ trunk/data/stub/nations/barbarian.ruleset Mon Jan 19 04:25:04 2015
@@ -19,4 +19,4 @@
cities = Barbaricum
is_playable = FALSE
-barbarian_type = Land
+barbarian_type = LandAndSea
Removed: trunk/data/stub/nations/pirate.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/nations/pirate.ruleset?rev=27716view=auto
==
--- trunk/data/stub/nations/pirate.ruleset (original)
+++ trunk/data/stub/nations/pirate.ruleset (removed)
@@ -1,23 +0,0 @@
-[nation_pirate]
-
-name=_(Pirate)
-plural=_(?plural:Pirates)
-legend=_(As long as honest men have sailed the seas, pirates have been a\
- scourge of them and of all coastal dwelling peoples.)
-leaders = { name, sex
- Pirate Leader, female
-}
-
-flag = pirate
-flag_alt = -
-style= Generic
-
-init_techs=
-init_buildings=
-init_units=
-
-cities =
- Generic Port
-
-is_playable = FALSE
-barbarian_type = Sea
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27721 - /branches/S2_6/doc/README.packaging
Author: cazfi Date: Mon Jan 19 04:39:16 2015 New Revision: 27721 URL: http://svn.gna.org/viewcvs/freeciv?rev=27721view=rev Log: Mention lua update in 2.6 README.packaging See patch #5715 Modified: branches/S2_6/doc/README.packaging Modified: branches/S2_6/doc/README.packaging URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.packaging?rev=27721r1=27720r2=27721view=diff == --- branches/S2_6/doc/README.packaging (original) +++ branches/S2_6/doc/README.packaging Mon Jan 19 04:39:16 2015 @@ -22,6 +22,7 @@ --enable-client=sdl2 * Development of ruleset editor, freeciv-ruledit, has begun. It has same Qt5 dependencies as other Qt programs in Freeciv distribution. +* Lua version to use is 5.3 now. * System lua library is now used by default. Copy of lua distributed with freeciv is used only if system lua is not found, or it's explicitly requested with configure option --disable-sys-lua ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27729 - /trunk/server/advisors/autosettlers.c
Author: cazfi
Date: Mon Jan 19 06:42:42 2015
New Revision: 27729
URL: http://svn.gna.org/viewcvs/freeciv?rev=27729view=rev
Log:
Correct autosettlers to consider activity being evaluated instead of hardcoded
ACTIVITY_GEN_ROAD.
See bug #23196
Modified:
trunk/server/advisors/autosettlers.c
Modified: trunk/server/advisors/autosettlers.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/advisors/autosettlers.c?rev=27729r1=27728r2=27729view=diff
==
--- trunk/server/advisors/autosettlers.c(original)
+++ trunk/server/advisors/autosettlers.cMon Jan 19 06:42:42 2015
@@ -595,7 +595,7 @@
}
if (act != ACTIVITY_LAST) {
-consider_settler_action(pplayer, ACTIVITY_GEN_ROAD, pextra,
extra, base_value,
+consider_settler_action(pplayer, act, pextra, extra,
base_value,
oldv, in_use, time,
best_newv, best_oldv,
improve_worked,
best_delay, best_act, best_target,
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27723 - /branches/S2_6/common/game.c
Author: cazfi Date: Mon Jan 19 04:45:07 2015 New Revision: 27723 URL: http://svn.gna.org/viewcvs/freeciv?rev=27723view=rev Log: Init scenario property 'handmade' See bug #23184 Modified: branches/S2_6/common/game.c Modified: branches/S2_6/common/game.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/game.c?rev=27723r1=27722r2=27723view=diff == --- branches/S2_6/common/game.c (original) +++ branches/S2_6/common/game.c Mon Jan 19 04:45:07 2015 @@ -336,6 +336,7 @@ game.scenario.name[0] = '\0'; game.scenario.players = TRUE; game.scenario.startpos_nations = FALSE; + game.scenario.handmade = FALSE; game.scenario.prevent_new_cities = FALSE; /* Veteran system. */ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27722 - /trunk/common/game.c
Author: cazfi Date: Mon Jan 19 04:45:00 2015 New Revision: 27722 URL: http://svn.gna.org/viewcvs/freeciv?rev=27722view=rev Log: Init scenario property 'handmade' See bug #23184 Modified: trunk/common/game.c Modified: trunk/common/game.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/game.c?rev=27722r1=27721r2=27722view=diff == --- trunk/common/game.c (original) +++ trunk/common/game.c Mon Jan 19 04:45:00 2015 @@ -336,6 +336,7 @@ game.scenario.name[0] = '\0'; game.scenario.players = TRUE; game.scenario.startpos_nations = FALSE; + game.scenario.handmade = FALSE; game.scenario.prevent_new_cities = FALSE; /* Veteran system. */ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27730 - /branches/S2_6/server/advisors/autosettlers.c
Author: cazfi
Date: Mon Jan 19 06:42:51 2015
New Revision: 27730
URL: http://svn.gna.org/viewcvs/freeciv?rev=27730view=rev
Log:
Correct autosettlers to consider activity being evaluated instead of hardcoded
ACTIVITY_GEN_ROAD.
See bug #23196
Modified:
branches/S2_6/server/advisors/autosettlers.c
Modified: branches/S2_6/server/advisors/autosettlers.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/advisors/autosettlers.c?rev=27730r1=27729r2=27730view=diff
==
--- branches/S2_6/server/advisors/autosettlers.c(original)
+++ branches/S2_6/server/advisors/autosettlers.cMon Jan 19 06:42:51 2015
@@ -595,7 +595,7 @@
}
if (act != ACTIVITY_LAST) {
-consider_settler_action(pplayer, ACTIVITY_GEN_ROAD, pextra,
extra, base_value,
+consider_settler_action(pplayer, act, pextra, extra,
base_value,
oldv, in_use, time,
best_newv, best_oldv,
improve_worked,
best_delay, best_act, best_target,
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
