Re: [Freeciv-Dev] (PR#35708) [Patch] Triremes cannot enter Deep Ocean
URL: http://bugs.freeciv.org/Ticket/Display.html?id=35708 On 24/03/2008, Marko Lindqvist wrote: On 11/02/2007, Marko Lindqvist wrote: Untested patch to limit Triremes to Ocean tiles. Applies on top of Deep Ocean patch #34265. Also, Triremes do not get move bonus from Nuclear Power. This one contains only ruleset changes. I'll commit this one first. Committed to TRUNK revision 14531. Left out from S2_2 for now, since current map generator parameters cause very unbalanced move restrictions to triremes. Once we find satisfactory settings by experimenting in TRUNK, we can backport this to S2_2. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#35708) [Patch] Triremes cannot enter Deep Ocean
URL: http://bugs.freeciv.org/Ticket/Display.html?id=35708 On 11/02/2007, Marko Lindqvist wrote: Untested patch to limit Triremes to Ocean tiles. Applies on top of Deep Ocean patch #34265. Also, Triremes do not get move bonus from Nuclear Power. Updated against S2_2 svn. There is no longer dependency to #34265 (as ruleset already has more than one ocean type). This one contains only ruleset changes. I'll commit this one first. Removing support for old style triremes from the codebase (Jason's patch) is a separate issue - and I'd like to hear comments from modpack authors before doing that. - ML diff -Nurd -X.diff_ignore freeciv/data/default/effects.ruleset freeciv/data/default/effects.ruleset --- freeciv/data/default/effects.ruleset 2008-01-15 04:53:36.0 +0200 +++ freeciv/data/default/effects.ruleset 2008-03-24 14:23:52.0 +0200 @@ -905,6 +905,15 @@ UnitClass, Sea, Local } +[effect_coastal_defense_trireme] +name = Defend_Bonus +value = 100 +reqs = +{ type, name, range + Building, Coastal Defense, City + UnitClass, Trireme, Local +} + [effect_colosseum] name = Make_Content value = 3 @@ -1267,6 +1276,24 @@ UnitClass, Sea, Local } +[effect_port_facility_trireme] +name = Veteran_Build +value = 1 +reqs = +{ type, name, range + Building, Port Facility, City + UnitClass, Trireme, Local +} + +[effect_port_facility_trireme_1] +name = HP_Regen +value = 100 +reqs = +{ type, name, range + Building, Port Facility, City + UnitClass, Trireme, Local +} + [effect_power_plant] name = Output_Bonus value = 25 @@ -1766,6 +1793,24 @@ UnitClass, Sea, Local } +[effect_lighthouse_trireme_move] +name = Move_Bonus +value = 1 +reqs = +{ type, name, range + Building, Lighthouse, Player + UnitClass, Trireme, Local +} + +[effect_lighthouse_trireme_veteran] +name = Veteran_Build +value = 1 +reqs = +{ type, name, range + Building, Lighthouse, Player + UnitClass, Trireme, Local +} + [effect_magellans_expedition] name = Move_Bonus value = 2 @@ -1775,6 +1820,15 @@ UnitClass, Sea, Local } +[effect_magellan_trireme] +name = Move_Bonus +value = 2 +reqs = +{ type, name, range + Building, Magellan's Expedition, Player + UnitClass, Trireme, Local +} + [effect_manhattan_project] name = Enable_Nuke value = 1 diff -Nurd -X.diff_ignore freeciv/data/default/terrain.ruleset freeciv/data/default/terrain.ruleset --- freeciv/data/default/terrain.ruleset 2007-10-29 21:10:36.0 +0200 +++ freeciv/data/default/terrain.ruleset 2008-03-24 14:31:02.0 +0200 @@ -206,7 +206,7 @@ warmer_drier_result = no cooler_wetter_result = no cooler_drier_result = no -native_to= Sea, Air, Missile, Helicopter +native_to= Sea, Air, Missile, Helicopter, Trireme flags= Oceanic, NoCities, NoPollution, UnsafeCoast property_ocean_depth = 0 helptext = _(\ @@ -244,7 +244,7 @@ warmer_drier_result = no cooler_wetter_result = no cooler_drier_result = no -native_to= Sea, Air, Missile, Helicopter +native_to= Sea, Air, Missile, Helicopter, Trireme flags= Oceanic, NoCities, NoPollution property_ocean_depth = 0 helptext = _(\ @@ -282,7 +282,7 @@ warmer_drier_result = no cooler_wetter_result = no cooler_drier_result = no -native_to= Sea, Air, Missile, Helicopter +native_to= Sea, Air, Missile, Helicopter, Trireme flags= Oceanic, NoCities, NoPollution property_ocean_depth = 0 helptext = _(\ @@ -320,7 +320,7 @@ warmer_drier_result = no cooler_wetter_result = no cooler_drier_result = no -native_to= Sea, Air, Missile, Helicopter +native_to= Sea, Air, Missile, Helicopter, Trireme flags= Oceanic, NoCities, NoPollution property_ocean_depth = 36 helptext = _(\ @@ -358,7 +358,7 @@ warmer_drier_result = no cooler_wetter_result = no cooler_drier_result = no -native_to= Sea, Air, Missile, Helicopter +native_to= Sea, Air, Missile, Helicopter, Trireme flags= Oceanic, NoCities, NoPollution, UnsafeCoast property_ocean_depth = 48 helptext = _(\ @@ -400,8 +400,8 @@ flags= Oceanic, NoCities, NoPollution, UnsafeCoast; UnsafeOcean property_ocean_depth = 87 helptext = _(\ -Oceans cover much of the world, and only sea units (Triremes and\ - other boats) can travel on them.\ +Oceans cover much of the world, and only seaworthy units\ + can travel on them.\ \n\n\ Ocean squares can never be polluted or subjected to fallout.\ ) @@ -438,8 +438,8 @@ flags= Oceanic, NoCities, NoPollution, UnsafeCoast; UnsafeOcean property_ocean_depth = 99 helptext = _(\ -Oceans cover much of the world, and only sea units (Triremes and\ - other boats) can
[Freeciv-Dev] (PR#35708) [Patch] Triremes cannot enter Deep Ocean
URL: http://bugs.freeciv.org/Ticket/Display.html?id=35708 [EMAIL PROTECTED] - Sun Feb 11 13:57:16 2007]: Untested patch to limit Triremes to Ocean tiles. Applies on top of Deep Ocean patch #34265. Also, Triremes do not get move bonus from Nuclear Power. Here is a more complicated spur-of-the-moment patch, it includes the trireme limitation and 34265, as well as removing all the trireme-specific code (much of which is already deprecated with the removal of dangerous tiles). -jason Index: version.in === --- version.in (revision 12631) +++ version.in (working copy) @@ -24,4 +24,4 @@ # - Avoid adding a new manditory capbility to the development branch for # as long as possible. We want to maintain network compatibility with # the stable branch for as long as possible. -FREECIV_NETWORK_CAPSTRING(+Freeciv.Devel.2007.Jan.21) +FREECIV_NETWORK_CAPSTRING(+Freeciv.Devel.2007.Feb.12) Index: doc/README.effects === --- doc/README.effects (revision 12631) +++ 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/ruleset.c === --- server/ruleset.c (revision 12631) +++ server/ruleset.c (working copy) @@ -1014,19 +1014,6 @@ free(def_vblist); } - /* highseas loss pct */ - def_vblist = secfile_lookup_int_vec(file, vet_levels_default, - veteran_system.veteran_highseas_loss_pct); - for (i = 0; i vet_levels_default; i++) { -game.trireme_loss_chance[i] = def_vblist[i]; - } - for (; i MAX_VET_LEVELS; i++) { -game.trireme_loss_chance[i] = 50; /* default */ - } - if (def_vblist) { -free(def_vblist); - } - /* move bonus */ def_vblist = secfile_lookup_int_vec(file, vet_levels_default, veteran_system.veteran_move_bonus); @@ -3205,8 +3192,6 @@ { struct packet_ruleset_game misc_p; - memcpy(misc_p.trireme_loss_chance, game.trireme_loss_chance, - sizeof(game.trireme_loss_chance)); memcpy(misc_p.work_veteran_chance, game.work_veteran_chance, sizeof(game.work_veteran_chance)); memcpy(misc_p.veteran_chance, game.veteran_chance, Index: server/unithand.c === --- server/unithand.c (revision 12631) +++ 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 12631) +++ data/amplio/terrain2.spec (working copy) @@ -144,76 +144,113 @@ tiles = { row, column,tag ; ocean cell sprites. See doc/README.graphics - 0, 0, t.ocean_cell_u000 - 0, 2, t.ocean_cell_u100 - 0, 4, t.ocean_cell_u010 - 0, 6, t.ocean_cell_u110 - 0, 8, t.ocean_cell_u001 - 0, 10, t.ocean_cell_u101 - 0, 12, t.ocean_cell_u011 - 0, 14, t.ocean_cell_u111 + 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.ocean_cell_d000 - 1, 2, t.ocean_cell_d100 - 1, 4, t.ocean_cell_d010 - 1, 6, t.ocean_cell_d110 - 1, 8, t.ocean_cell_d001 - 1, 10, t.ocean_cell_d101 - 1, 12, t.ocean_cell_d011 - 1, 14, t.ocean_cell_d111 + 1, 0, t.l0.ocean_cell_d000 + 1, 2, t.l0.ocean_cell_d100 + 1, 4, t.l0.ocean_cell_d010 + 1, 6, t.l0.ocean_cell_d110 + 1, 8, t.l0.ocean_cell_d001 + 1, 10, t.l0.ocean_cell_d101 + 1, 12, t.l0.ocean_cell_d011 + 1, 14, t.l0.ocean_cell_d111 - 2, 0, t.ocean_cell_l000 - 2, 2, t.ocean_cell_l100 - 2, 4, t.ocean_cell_l010 - 2, 6, t.ocean_cell_l110 - 2, 8, t.ocean_cell_l001 - 2, 10, t.ocean_cell_l101 - 2, 12, t.ocean_cell_l011 - 2, 14, t.ocean_cell_l111 + 2, 0, t.l0.ocean_cell_l000 + 2, 2, t.l0.ocean_cell_l100 + 2, 4, t.l0.ocean_cell_l010 + 2, 6, t.l0.ocean_cell_l110 + 2, 8, t.l0.ocean_cell_l001 + 2, 10, t.l0.ocean_cell_l101 + 2, 12, t.l0.ocean_cell_l011 + 2, 14, t.l0.ocean_cell_l111 - 2, 1, t.ocean_cell_r000 - 2, 3, t.ocean_cell_r100 - 2, 5, t.ocean_cell_r010 - 2, 7, t.ocean_cell_r110 - 2, 9, t.ocean_cell_r001 - 2, 11, t.ocean_cell_r101 - 2, 13, t.ocean_cell_r011 - 2, 15, t.ocean_cell_r111 + 2, 1, t.l0.ocean_cell_r000 + 2, 3, t.l0.ocean_cell_r100 + 2, 5, t.l0.ocean_cell_r010 + 2, 7,
[Freeciv-Dev] (PR#35708) [Patch] Triremes cannot enter Deep Ocean
URL: http://bugs.freeciv.org/Ticket/Display.html?id=35708 Untested patch to limit Triremes to Ocean tiles. Applies on top of Deep Ocean patch #34265. Also, Triremes do not get move bonus from Nuclear Power. - ML diff -Nurd -X.diff_ignore freeciv/data/default/effects.ruleset freeciv/data/default/effects.ruleset --- freeciv/data/default/effects.ruleset 2006-07-17 23:56:23.0 +0300 +++ freeciv/data/default/effects.ruleset 2007-02-11 15:48:11.0 +0200 @@ -886,6 +886,15 @@ UnitClass, Sea, Local } +[effect_coastal_defense_trireme] +name = Defend_Bonus +value = 100 +reqs = +{ type, name, range + Building, Coastal Defense, City + UnitClass, Trireme, Local +} + [effect_colosseum] name = Make_Content value = 3 @@ -1248,6 +1257,24 @@ UnitClass, Sea, Local } +[effect_port_facility_trireme] +name = Veteran_Build +value = 1 +reqs = +{ type, name, range + Building, Port Facility, City + UnitClass, Trireme, Local +} + +[effect_port_facility_trireme_1] +name = HP_Regen +value = 100 +reqs = +{ type, name, range + Building, Port Facility, City + UnitClass, Trireme, Local +} + [effect_power_plant] name = Output_Bonus value = 25 @@ -1681,6 +1708,24 @@ UnitClass, Sea, Local } +[effect_lighthouse_trireme_move] +name = Move_Bonus +value = 1 +reqs = +{ type, name, range + Building, Lighthouse, Player + UnitClass, Trireme, Local +} + +[effect_lighthouse_trireme_veteran] +name = Veteran_Build +value = 1 +reqs = +{ type, name, range + Building, Lighthouse, Player + UnitClass, Trireme, Local +} + [effect_magellans_expedition] name = Move_Bonus value = 2 @@ -1690,6 +1735,15 @@ UnitClass, Sea, Local } +[effect_magellan_trireme] +name = Move_Bonus +value = 2 +reqs = +{ type, name, range + Building, Magellan's Expedition, Player + UnitClass, Trireme, Local +} + [effect_manhattan_project] name = Enable_Nuke value = 1 diff -Nurd -X.diff_ignore freeciv/data/default/terrain.ruleset freeciv/data/default/terrain.ruleset --- freeciv/data/default/terrain.ruleset 2007-02-11 15:49:08.0 +0200 +++ freeciv/data/default/terrain.ruleset 2007-02-11 15:45:13.0 +0200 @@ -520,7 +520,7 @@ warmer_drier_result = no cooler_wetter_result = no cooler_drier_result = no -native_to= Sea, Air, Missile, Helicopter +native_to= Sea, Trireme, Air, Missile, Helicopter flags= Oceanic, NoPollution, UnsafeCoast, NoCities property_ocean_depth = 30 helptext = _(\ diff -Nurd -X.diff_ignore freeciv/data/default/units.ruleset freeciv/data/default/units.ruleset --- freeciv/data/default/units.ruleset 2007-01-30 01:10:56.0 +0200 +++ freeciv/data/default/units.ruleset 2007-02-11 15:49:55.0 +0200 @@ -100,6 +100,13 @@ hp_loss_pct = 0 flags = TerrainSpeed, DamageSlows +[unitclass_trireme] +name = _(Trireme) +move_type = Sea +min_speed = 2 +hp_loss_pct = 0 +flags = TerrainSpeed, DamageSlows + [unitclass_heli] name = _(Helicopter) move_type = Both @@ -1187,7 +1194,7 @@ [unit_trireme] name = _(Trireme) -class = Sea +class = Trireme tech_req = Map Making obsolete_by = Caravel graphic = u.trireme @@ -1211,7 +1218,7 @@ uk_food = 0 uk_gold = 0 cargo = Land -flags = Trireme, BadCityDefender +flags = BadCityDefender roles = Ferryboat [unit_caravel] ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev