http://bugs.freeciv.org/Ticket/Display.html?id=35908 >
Jason Short wrote:
> http://bugs.freeciv.org/Ticket/Display.html?id=35908 >
>
> Here is an updated patch for the crazy ocean graphics.
...
Index: doc/README.effects
===
--- doc/README.effects (revision 12674)
+++ doc/README.effects (working copy)
@@ -120,9 +120,6 @@
No_Anarchy
No period of anarchy between government changes.
-No_Sink_Deep
-Triremes no longer sink when on dangerous seas.
-
Nuke_Proof
City is nuke proof.
Index: server/unithand.c
===
--- server/unithand.c (revision 12674)
+++ server/unithand.c (working copy)
@@ -951,10 +951,6 @@
notify_player(unit_owner(punit), src_tile, E_BAD_COMMAND,
_("%s can only move into your own zone of control."),
unit_type(punit)->name);
- } else if (reason == MR_TRIREME) {
-notify_player(unit_owner(punit), src_tile, E_BAD_COMMAND,
- _("%s cannot move that far from the coast line."),
- unit_type(punit)->name);
}
return FALSE;
}
Index: data/amplio/terrain2.spec
===
--- data/amplio/terrain2.spec (revision 12674)
+++ data/amplio/terrain2.spec (working copy)
@@ -68,60 +68,60 @@
;forrests as overlay
- 4, 0, "t.l1.forest_n0e0s0w0"
- 4, 1, "t.l1.forest_n1e0s0w0"
- 4, 2, "t.l1.forest_n0e1s0w0"
- 4, 3, "t.l1.forest_n1e1s0w0"
- 4, 4, "t.l1.forest_n0e0s1w0"
- 4, 5, "t.l1.forest_n1e0s1w0"
- 4, 6, "t.l1.forest_n0e1s1w0"
- 4, 7, "t.l1.forest_n1e1s1w0"
- 5, 0, "t.l1.forest_n0e0s0w1"
- 5, 1, "t.l1.forest_n1e0s0w1"
- 5, 2, "t.l1.forest_n0e1s0w1"
- 5, 3, "t.l1.forest_n1e1s0w1"
- 5, 4, "t.l1.forest_n0e0s1w1"
- 5, 5, "t.l1.forest_n1e0s1w1"
- 5, 6, "t.l1.forest_n0e1s1w1"
- 5, 7, "t.l1.forest_n1e1s1w1"
+ 4, 0, "t.l2.forest_n0e0s0w0"
+ 4, 1, "t.l2.forest_n1e0s0w0"
+ 4, 2, "t.l2.forest_n0e1s0w0"
+ 4, 3, "t.l2.forest_n1e1s0w0"
+ 4, 4, "t.l2.forest_n0e0s1w0"
+ 4, 5, "t.l2.forest_n1e0s1w0"
+ 4, 6, "t.l2.forest_n0e1s1w0"
+ 4, 7, "t.l2.forest_n1e1s1w0"
+ 5, 0, "t.l2.forest_n0e0s0w1"
+ 5, 1, "t.l2.forest_n1e0s0w1"
+ 5, 2, "t.l2.forest_n0e1s0w1"
+ 5, 3, "t.l2.forest_n1e1s0w1"
+ 5, 4, "t.l2.forest_n0e0s1w1"
+ 5, 5, "t.l2.forest_n1e0s1w1"
+ 5, 6, "t.l2.forest_n0e1s1w1"
+ 5, 7, "t.l2.forest_n1e1s1w1"
;mountains as overlay
- 6, 0, "t.l1.mountains_n0e0s0w0"
- 6, 1, "t.l1.mountains_n0e0s0w1"
- 6, 2, "t.l1.mountains_n0e0s1w0"
- 6, 3, "t.l1.mountains_n0e0s1w1"
- 6, 4, "t.l1.mountains_n0e1s0w0"
- 6, 5, "t.l1.mountains_n0e1s0w1"
- 6, 6, "t.l1.mountains_n0e1s1w0"
- 6, 7, "t.l1.mountains_n0e1s1w1"
- 7, 0, "t.l1.mountains_n1e0s0w0"
- 7, 1, "t.l1.mountains_n1e0s0w1"
- 7, 2, "t.l1.mountains_n1e0s1w0"
- 7, 3, "t.l1.mountains_n1e0s1w1"
- 7, 4, "t.l1.mountains_n1e1s0w0"
- 7, 5, "t.l1.mountains_n1e1s0w1"
- 7, 6, "t.l1.mountains_n1e1s1w0"
- 7, 7, "t.l1.mountains_n1e1s1w1"
+ 6, 0, "t.l2.mountains_n0e0s0w0"
+ 6, 1, "t.l2.mountains_n0e0s0w1"
+ 6, 2, "t.l2.mountains_n0e0s1w0"
+ 6, 3, "t.l2.mountains_n0e0s1w1"
+ 6, 4, "t.l2.mountains_n0e1s0w0"
+ 6, 5, "t.l2.mountains_n0e1s0w1"
+ 6, 6, "t.l2.mountains_n0e1s1w0"
+ 6, 7, "t.l2.mountains_n0e1s1w1"
+ 7, 0, "t.l2.mountains_n1e0s0w0"
+ 7, 1, "t.l2.mountains_n1e0s0w1"
+ 7, 2, "t.l2.mountains_n1e0s1w0"
+ 7, 3, "t.l2.mountains_n1e0s1w1"
+ 7, 4, "t.l2.mountains_n1e1s0w0"
+ 7, 5, "t.l2.mountains_n1e1s0w1"
+ 7, 6, "t.l2.mountains_n1e1s1w0"
+ 7, 7, "t.l2.mountains_n1e1s1w1"
;hills as overlay
- 8, 0, "t.l1.hills_n0e0s0w0"
- 8, 1, "t.l1.hills_n0e0s0w1"
- 8, 2, "t.l1.hills_n0e0s1w0"
- 8, 3, "t.l1.hills_n0e0s1w1"
- 8, 4, "t.l1.hills_n0e1s0w0"
- 8, 5, "t.l1.hills_n0e1s0w1"
- 8, 6, "t.l1.hills_n0e1s1w0"
- 8, 7, "t.l1.hills_n0e1s1w1"
- 9, 0, "t.l1.hills_n1e0s0w0"
- 9, 1, "t.l1.hills_n1e0s0w1"
- 9, 2, "t.l1.hills_n1e0s1w0"
- 9, 3, "t.l1.hills_n1e0s1w1"
- 9, 4, "t.l1.hills_n1e1s0w0"
- 9, 5, "t.l1.hills_n1e1s0w1"
- 9, 6, "t.l1.hills_n1e1s1w0"
- 9, 7, "t.l1.hills_n1e1s1w1"
+ 8, 0, "t.l2.hills_n0e0s0w0"
+ 8, 1, "t.l2.hills_n0e0s0w1"
+ 8, 2, "t.l2.hills_n0e0s1w0"
+ 8, 3, "t.l2.hills_n0e0s1w1"
+ 8, 4, "t.l2.hills_n0e1s0w0"
+ 8, 5, "t.l2.hills_n0e1s0w1"
+ 8, 6, "t.l2.hills_n0e1s1w0"
+ 8, 7, "t.l2.hills_n0e1s1w1"
+ 9, 0, "t.l2.hills_n1e0s0w0"
+ 9, 1, "t.l2.hills_n1e0s0w1"
+ 9, 2, "t.l2.hills_n1e0s1w0"
+ 9, 3, "t.l2.hills_n1e0s1w1"
+ 9, 4, "t.l2.hills_n1e1s0w0"
+ 9, 5, "t.l2.hills_n1e1s0w1"
+ 9, 6, "t.l2.hills_n1e1s1w0"
+ 9, 7, "t.l2.hills_n1e1s1w1"
;river outlets
@@ -144,76 +144,113 @@
tiles = { "row", "column","tag"
; ocean cell sprites. See doc/README.graphics
- 0, 0, "t.l0.ocean_cell_u000"
- 0, 2, "t.l0.ocean_cell_u100"
- 0, 4, "t.l0.ocean_cell_u010"
- 0, 6, "t.l0.ocean_cell_u110"
- 0, 8, "t.l0.ocean_cell_u001"
- 0, 10, "t.l0.ocean_cell_u101"
- 0, 12, "t.l0.ocean_cell_u011"
- 0, 14, "t.l0.ocean_cell_u111"
-
- 1, 0, "t.l0.ocean_cell_d000"
- 1, 2, "t.l0.ocean_cel