Author: cazfi
Date: Thu Feb 12 21:31:59 2015
New Revision: 28114
URL: http://svn.gna.org/viewcvs/freeciv?rev=28114&view=rev
Log:
Made experimental and multiplayer rulesets to use default ai_effects.ruleset
See patch #4754
Removed:
trunk/data/experimental/ai_effects.ruleset
trunk/data/multiplayer/ai_effects.ruleset
Modified:
trunk/data/experimental/Makefile.am
trunk/data/experimental/effects.ruleset
trunk/data/multiplayer/Makefile.am
trunk/data/multiplayer/effects.ruleset
Modified: trunk/data/experimental/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/Makefile.am?rev=28114&r1=28113&r2=28114&view=diff
==============================================================================
--- trunk/data/experimental/Makefile.am (original)
+++ trunk/data/experimental/Makefile.am Thu Feb 12 21:31:59 2015
@@ -4,7 +4,6 @@
pkgdatadir = $(datadir)/$(PACKAGE)/experimental
pkgdata_DATA = \
- ai_effects.ruleset \
buildings.ruleset \
cities.ruleset \
effects.ruleset \
Removed: trunk/data/experimental/ai_effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/ai_effects.ruleset?rev=28113&view=auto
==============================================================================
--- trunk/data/experimental/ai_effects.ruleset (original)
+++ trunk/data/experimental/ai_effects.ruleset (removed)
@@ -1,107 +0,0 @@
-; This is the experimental ruleset. See doc/README.ruleset_experimental
-; for a detailed description.
-
-; Modifying this file:
-; You should not modify this file except to make bugfixes or
-; for other "maintenance". If you want to make custom changes,
-; you should create a new datadir subdirectory and copy this file
-; into that directory, and then modify that copy. Then use the
-; command "rulesetdir <mysubdir>" in the server to have freeciv
-; use your new customized file. Note that this file is not read
-; directly, but only through *include* in effects.ruleset
-
-; Note that the freeciv AI may not cope well with anything more
-; than minor changes.
-
-; /* <-- avoid gettext warnings
-; */ <-- avoid gettext warnings
-
-[effect_ai_cheat_no_max_rates]
-type = "Max_Rates"
-value = 100
-reqs =
- { "type", "name", "range"
- "AI", "Cheating", "Player"
- }
-
-[effect_ai_cheat_science]
-type = "Output_Bonus"
-value = 40
-reqs =
- { "type", "name", "range"
- "AI", "Cheating", "Player"
- "OutputType", "Science", "Local"
- }
-
-[effect_ai_cheat_happiness]
-type = "Make_Content"
-value = 1
-reqs =
- { "type", "name", "range"
- "AI", "Cheating", "Player"
- }
-
-[effect_ai_cheat_pollution]
-type = "Pollu_Prod_Pct"
-value = -25
-reqs =
- { "type", "name", "range"
- "AI", "Cheating", "Player"
- }
-
-[effect_ai_cheat_veteran]
-type = "Veteran_Combat"
-value = 20
-reqs =
- { "type", "name", "range"
- "AI", "Cheating", "Player"
- }
-
-[effect_ai_handicapped_science]
-type = "Output_Bonus"
-value = -25
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- "OutputType", "Science", "Local"
- }
-
-[effect_ai_handicapped_defense]
-type = "Defend_Bonus"
-value = -25
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- }
-
-[effect_ai_handicapped_bribe]
-type = "Unit_Bribe_Cost_Pct"
-value = -20
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- }
-
-[effect_ai_handicapped_routes]
-type = "Max_Trade_Routes"
-value = -1
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- }
-
-[effect_ai_handicapped_trade_bonus]
-type = "Trade_Revenue_Bonus"
-value = -100
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- }
-
-[effect_ai_handicapped_migration]
-type = "Migration_Pct"
-value = -20
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- }
Modified: trunk/data/experimental/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/effects.ruleset?rev=28114&r1=28113&r2=28114&view=diff
==============================================================================
--- trunk/data/experimental/effects.ruleset (original)
+++ trunk/data/experimental/effects.ruleset Thu Feb 12 21:31:59 2015
@@ -32,7 +32,7 @@
; */ <-- avoid gettext warnings
; Cheating AI effects are in separate file
-*include "experimental/ai_effects.ruleset"
+*include "default/ai_effects.ruleset"
[effect_unhappysize]
type = "City_Unhappy_Size"
Modified: trunk/data/multiplayer/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/Makefile.am?rev=28114&r1=28113&r2=28114&view=diff
==============================================================================
--- trunk/data/multiplayer/Makefile.am (original)
+++ trunk/data/multiplayer/Makefile.am Thu Feb 12 21:31:59 2015
@@ -4,7 +4,6 @@
pkgdatadir = $(datadir)/$(PACKAGE)/multiplayer
pkgdata_DATA = \
- ai_effects.ruleset \
buildings.ruleset \
cities.ruleset \
effects.ruleset \
Removed: trunk/data/multiplayer/ai_effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/ai_effects.ruleset?rev=28113&view=auto
==============================================================================
--- trunk/data/multiplayer/ai_effects.ruleset (original)
+++ trunk/data/multiplayer/ai_effects.ruleset (removed)
@@ -1,104 +0,0 @@
-; Modifying this file:
-; You should not modify this file except to make bugfixes or
-; for other "maintenance". If you want to make custom changes,
-; you should create a new datadir subdirectory and copy this file
-; into that directory, and then modify that copy. Then use the
-; command "rulesetdir <mysubdir>" in the server to have freeciv
-; use your new customized file. Note that this file is not read
-; directly, but only thorugh *include* in effects.ruleset
-
-; Note that the freeciv AI may not cope well with anything more
-; than minor changes.
-
-; /* <-- avoid gettext warnings
-; */ <-- avoid gettext warnings
-
-[effect_ai_cheat_no_max_rates]
-type = "Max_Rates"
-value = 100
-reqs =
- { "type", "name", "range"
- "AI", "Cheating", "Player"
- }
-
-[effect_ai_cheat_science]
-type = "Output_Bonus"
-value = 40
-reqs =
- { "type", "name", "range"
- "AI", "Cheating", "Player"
- "OutputType", "Science", "Local"
- }
-
-[effect_ai_cheat_happiness]
-type = "Make_Content"
-value = 1
-reqs =
- { "type", "name", "range"
- "AI", "Cheating", "Player"
- }
-
-[effect_ai_cheat_pollution]
-type = "Pollu_Prod_Pct"
-value = -25
-reqs =
- { "type", "name", "range"
- "AI", "Cheating", "Player"
- }
-
-[effect_ai_cheat_veteran]
-type = "Veteran_Combat"
-value = 20
-reqs =
- { "type", "name", "range"
- "AI", "Cheating", "Player"
- }
-
-[effect_ai_handicapped_science]
-type = "Output_Bonus"
-value = -25
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- "OutputType", "Science", "Local"
- }
-
-[effect_ai_handicapped_defense]
-type = "Defend_Bonus"
-value = -25
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- }
-
-[effect_ai_handicapped_bribe]
-type = "Unit_Bribe_Cost_Pct"
-value = -20
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- }
-
-[effect_ai_handicapped_routes]
-type = "Max_Trade_Routes"
-value = -1
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- }
-
-[effect_ai_handicapped_trade_bonus]
-type = "Trade_Revenue_Bonus"
-value = -100
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- }
-
-[effect_ai_handicapped_migration]
-type = "Migration_Pct"
-value = -20
-reqs =
- { "type", "name", "range"
- "AI", "Handicapped", "Player"
- }
Modified: trunk/data/multiplayer/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/effects.ruleset?rev=28114&r1=28113&r2=28114&view=diff
==============================================================================
--- trunk/data/multiplayer/effects.ruleset (original)
+++ trunk/data/multiplayer/effects.ruleset Thu Feb 12 21:31:59 2015
@@ -29,7 +29,7 @@
; */ <-- avoid gettext warnings
; Cheating AI effects are in separate file
-*include "multiplayer/ai_effects.ruleset"
+*include "default/ai_effects.ruleset"
[effect_unhappysize]
type = "City_Unhappy_Size"
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
