Author: cazfi
Date: Sun Dec 6 23:09:21 2015
New Revision: 30870
URL: http://svn.gna.org/viewcvs/freeciv?rev=30870&view=rev
Log:
Increased granularity of spontanous extra dis/appearance chance to be 1/10000
See patch #6615
Modified:
trunk/data/alien/terrain.ruleset
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/multiplayer/terrain.ruleset
trunk/data/sandbox/terrain.ruleset
trunk/data/stub/terrain.ruleset
trunk/server/srv_main.c
Modified: trunk/data/alien/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/terrain.ruleset?rev=30870&r1=30869&r2=30870&view=diff
==============================================================================
--- trunk/data/alien/terrain.ruleset (original)
+++ trunk/data/alien/terrain.ruleset Sun Dec 6 23:09:21 2015
@@ -619,11 +619,11 @@
; (default none)
; appearance_chance = If extra has cause "Appear" and other requirements
; for its appearance are fulfilled, this tells how
big
-; chance it has to appear each turn. The chance is
1/1000
+; chance it has to appear each turn. The chance is
1/10000
; times this value.
; disappearance_chance = If extra has rmcause "Disappear" and other
requirements
; for its disappearance are fulfilled, this tells
how big
-; chance it has to disappear each turn. The chance
is 1/1000
+; chance it has to disappear each turn. The chance
is 1/10000
; times this value.
; native_to = List of unit classes that are considered to
; be inside the extra when they are on same tile
Modified: trunk/data/civ1/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/terrain.ruleset?rev=30870&r1=30869&r2=30870&view=diff
==============================================================================
--- trunk/data/civ1/terrain.ruleset (original)
+++ trunk/data/civ1/terrain.ruleset Sun Dec 6 23:09:21 2015
@@ -776,11 +776,11 @@
; (default none)
; appearance_chance = If extra has cause "Appear" and other requirements
; for its appearance are fulfilled, this tells how
big
-; chance it has to appear each turn. The chance is
1/1000
+; chance it has to appear each turn. The chance is
1/10000
; times this value.
; disappearance_chance = If extra has rmcause "Disappear" and other
requirements
; for its disappearance are fulfilled, this tells
how big
-; chance it has to disappear each turn. The chance
is 1/1000
+; chance it has to disappear each turn. The chance
is 1/10000
; times this value.
; native_to = List of unit classes that are considered to
; be inside the extra when they are on same tile
Modified: trunk/data/civ2/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/terrain.ruleset?rev=30870&r1=30869&r2=30870&view=diff
==============================================================================
--- trunk/data/civ2/terrain.ruleset (original)
+++ trunk/data/civ2/terrain.ruleset Sun Dec 6 23:09:21 2015
@@ -882,11 +882,11 @@
; (default none)
; appearance_chance = If extra has cause "Appear" and other requirements
; for its appearance are fulfilled, this tells how
big
-; chance it has to appear each turn. The chance is
1/1000
+; chance it has to appear each turn. The chance is
1/10000
; times this value.
; disappearance_chance = If extra has rmcause "Disappear" and other
requirements
; for its disappearance are fulfilled, this tells
how big
-; chance it has to disappear each turn. The chance
is 1/1000
+; chance it has to disappear each turn. The chance
is 1/10000
; times this value.
; native_to = List of unit classes that are considered to
; be inside the extra when they are on same tile
Modified: trunk/data/civ2civ3/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/terrain.ruleset?rev=30870&r1=30869&r2=30870&view=diff
==============================================================================
--- trunk/data/civ2civ3/terrain.ruleset (original)
+++ trunk/data/civ2civ3/terrain.ruleset Sun Dec 6 23:09:21 2015
@@ -1071,11 +1071,11 @@
; (default none)
; appearance_chance = If extra has cause "Appear" and other requirements
; for its appearance are fulfilled, this tells how
big
-; chance it has to appear each turn. The chance is
1/1000
+; chance it has to appear each turn. The chance is
1/10000
; times this value.
; disappearance_chance = If extra has rmcause "Disappear" and other
requirements
; for its disappearance are fulfilled, this tells
how big
-; chance it has to disappear each turn. The chance
is 1/1000
+; chance it has to disappear each turn. The chance
is 1/10000
; times this value.
; native_to = List of unit classes that are considered to
; be inside the extra when they are on same tile
Modified: trunk/data/classic/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/terrain.ruleset?rev=30870&r1=30869&r2=30870&view=diff
==============================================================================
--- trunk/data/classic/terrain.ruleset (original)
+++ trunk/data/classic/terrain.ruleset Sun Dec 6 23:09:21 2015
@@ -1061,11 +1061,11 @@
; (default none)
; appearance_chance = If extra has cause "Appear" and other requirements
; for its appearance are fulfilled, this tells how
big
-; chance it has to appear each turn. The chance is
1/1000
+; chance it has to appear each turn. The chance is
1/10000
; times this value.
; disappearance_chance = If extra has rmcause "Disappear" and other
requirements
; for its disappearance are fulfilled, this tells
how big
-; chance it has to disappear each turn. The chance
is 1/1000
+; chance it has to disappear each turn. The chance
is 1/10000
; times this value.
; native_to = List of unit classes that are considered to
; be inside the extra when they are on same tile
Modified: trunk/data/experimental/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/terrain.ruleset?rev=30870&r1=30869&r2=30870&view=diff
==============================================================================
--- trunk/data/experimental/terrain.ruleset (original)
+++ trunk/data/experimental/terrain.ruleset Sun Dec 6 23:09:21 2015
@@ -1037,11 +1037,11 @@
; (default none)
; appearance_chance = If extra has cause "Appear" and other requirements
; for its appearance are fulfilled, this tells how
big
-; chance it has to appear each turn. The chance is
1/1000
+; chance it has to appear each turn. The chance is
1/10000
; times this value.
; disappearance_chance = If extra has rmcause "Disappear" and other
requirements
; for its disappearance are fulfilled, this tells
how big
-; chance it has to disappear each turn. The chance
is 1/1000
+; chance it has to disappear each turn. The chance
is 1/10000
; times this value.
; native_to = List of unit classes that are considered to
; be inside the extra when they are on same tile
Modified: trunk/data/multiplayer/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/terrain.ruleset?rev=30870&r1=30869&r2=30870&view=diff
==============================================================================
--- trunk/data/multiplayer/terrain.ruleset (original)
+++ trunk/data/multiplayer/terrain.ruleset Sun Dec 6 23:09:21 2015
@@ -1035,11 +1035,11 @@
; (default none)
; appearance_chance = If extra has cause "Appear" and other requirements
; for its appearance are fulfilled, this tells how
big
-; chance it has to appear each turn. The chance is
1/1000
+; chance it has to appear each turn. The chance is
1/10000
; times this value.
; disappearance_chance = If extra has rmcause "Disappear" and other
requirements
; for its disappearance are fulfilled, this tells
how big
-; chance it has to disappear each turn. The chance
is 1/1000
+; chance it has to disappear each turn. The chance
is 1/10000
; times this value.
; native_to = List of unit classes that are considered to
; be inside the extra when they are on same tile
Modified: trunk/data/sandbox/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/terrain.ruleset?rev=30870&r1=30869&r2=30870&view=diff
==============================================================================
--- trunk/data/sandbox/terrain.ruleset (original)
+++ trunk/data/sandbox/terrain.ruleset Sun Dec 6 23:09:21 2015
@@ -1071,11 +1071,11 @@
; (default none)
; appearance_chance = If extra has cause "Appear" and other requirements
; for its appearance are fulfilled, this tells how
big
-; chance it has to appear each turn. The chance is
1/1000
+; chance it has to appear each turn. The chance is
1/10000
; times this value.
; disappearance_chance = If extra has rmcause "Disappear" and other
requirements
; for its disappearance are fulfilled, this tells
how big
-; chance it has to disappear each turn. The chance
is 1/1000
+; chance it has to disappear each turn. The chance
is 1/10000
; times this value.
; native_to = List of unit classes that are considered to
; be inside the extra when they are on same tile
Modified: trunk/data/stub/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/terrain.ruleset?rev=30870&r1=30869&r2=30870&view=diff
==============================================================================
--- trunk/data/stub/terrain.ruleset (original)
+++ trunk/data/stub/terrain.ruleset Sun Dec 6 23:09:21 2015
@@ -332,11 +332,11 @@
; (default none)
; appearance_chance = If extra has cause "Appear" and other requirements
; for its appearance are fulfilled, this tells how
big
-; chance it has to appear each turn. The chance is
1/1000
+; chance it has to appear each turn. The chance is
1/10000
; times this value.
; disappearance_chance = If extra has rmcause "Disappear" and other
requirements
; for its disappearance are fulfilled, this tells
how big
-; chance it has to disappear each turn. The chance
is 1/1000
+; chance it has to disappear each turn. The chance
is 1/10000
; times this value.
; native_to = List of unit classes that are considered to
; be inside the extra when they are on same tile
Modified: trunk/server/srv_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=30870&r1=30869&r2=30870&view=diff
==============================================================================
--- trunk/server/srv_main.c (original)
+++ trunk/server/srv_main.c Sun Dec 6 23:09:21 2015
@@ -1377,7 +1377,7 @@
extra_type_by_rmcause_iterate(ERM_DISAPPEARANCE, pextra) {
whole_map_iterate(ptile) {
if (tile_has_extra(ptile, pextra)
- && fc_rand(1000) < pextra->disappearance_chance
+ && fc_rand(10000) < pextra->disappearance_chance
&& can_extra_disappear(pextra, ptile)) {
tile_remove_extra(ptile, pextra);
@@ -1407,7 +1407,7 @@
extra_type_by_cause_iterate(EC_APPEARANCE, pextra) {
whole_map_iterate(ptile) {
if (!tile_has_extra(ptile, pextra)
- && fc_rand(1000) < pextra->appearance_chance
+ && fc_rand(10000) < pextra->appearance_chance
&& can_extra_appear(pextra, ptile)) {
tile_add_extra(ptile, pextra);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
