From d8bd9080d08bb0bf7541ff9806d6c5be185bd3fb Mon Sep 17 00:00:00 2001
From: Lexxie9952 <32187224+Lexxie9952@users.noreply.github.com>
Date: Wed, 27 Oct 2021 17:34:44 -0700
Subject: [PATCH] MP2D

---
 .../src/derived/webapp/man/mp2-dragoon7.bak.html     |  2 +-
 freeciv/freeciv/data/mp2-dragoon/changelog.txt       | 12 +++++++-----
 freeciv/freeciv/data/mp2-dragoon/effects.ruleset     |  2 +-
 freeciv/freeciv/data/mp2-dragoon/units.ruleset       |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/freeciv-web/src/derived/webapp/man/mp2-dragoon7.bak.html b/freeciv-web/src/derived/webapp/man/mp2-dragoon7.bak.html
index f56ed0a62..afd277b9f 100644
--- a/freeciv-web/src/derived/webapp/man/mp2-dragoon7.bak.html
+++ b/freeciv-web/src/derived/webapp/man/mp2-dragoon7.bak.html
@@ -4859,7 +4859,7 @@ <h3 class='section'>Goods</h3>
 <pre class='hitpoints'>Hitpoints: 1</pre>
 <pre class='obsolete'>Obsolete by: Freight</pre>
 <pre class='helptext'><b class='unit_desc' style='line-height:115%;font-size:115%;'>Goods are commodities. The cargo containers of the ancient world were amphorae, which carried for trade goods.
-Goods can be used to establish Trade Route or Enter Marketplace. They can be carried by Commerce units, allowing you to establish multiple trade routes in one voyage. Also, Goods can Recycle Production with only a 25% penalty, rendering 15 shields into a city production target.
+Goods can be used to establish Trade Route or Enter Marketplace. They can be carried by Commerce units, allowing you to establish multiple trade routes in one voyage. Also, Goods can Recycle Production with only a 15% penalty, rendering 17 shields into a city production target.
 </b>
 <b class='unit_desc' style='line-height:115%;font-size:115%;'>By themselves, Goods can only move onto tiles with a City, Quay, Fortress, or Naval Base. Commerce units, Tribesmen, and Galleons may carry them as cargo. If adjacent to a foreign city, use the D command (D) for Commerce functions.</b>
 <hr style='border-top: 1px solid #000'>➤ Belongs to Cargo unit class.
diff --git a/freeciv/freeciv/data/mp2-dragoon/changelog.txt b/freeciv/freeciv/data/mp2-dragoon/changelog.txt
index 53f1dd727..807d73325 100644
--- a/freeciv/freeciv/data/mp2-dragoon/changelog.txt
+++ b/freeciv/freeciv/data/mp2-dragoon/changelog.txt
@@ -26,11 +26,12 @@ game.
 ============================================================
 2. Mountain Goats (3 1 0) & Hippopotami (3 1 0)
 ============================================================
-3. Goods available with Pottery and cost 20. Besides giving
-starting Tribesmen and Caravan something to carry, and being
-more realistic, it brings to life the original purpose of
-this virtual unit for the early game. The cheaper cost 
-makes this unit more favorable to early game economics.
+3. Goods available with Pottery and cost 20. 25% recycle
+penalty changed to -15%. Besides giving starting Tribesmen
+and Caravan something to carry, and being more realistic,
+it brings to life the original purpose of this virtual unit
+for the early game. The cheaper cost makes this unit more
+favorable to early game economics.
 ============================================================
 4. "Advisor" for buildings suggests an order similar to 
    an experienced player, instead of alphabetic.
@@ -148,3 +149,4 @@ makes this unit more favorable to early game economics.
 =============================================================
 
 
+
diff --git a/freeciv/freeciv/data/mp2-dragoon/effects.ruleset b/freeciv/freeciv/data/mp2-dragoon/effects.ruleset
index 6d5631cce..973f1c721 100644
--- a/freeciv/freeciv/data/mp2-dragoon/effects.ruleset
+++ b/freeciv/freeciv/data/mp2-dragoon/effects.ruleset
@@ -5289,7 +5289,7 @@ reqs    =
     }
 [effect_colossus_goods_discount]
 type    = "Unit_Build_Cost_Pct"
-value	  = -25     ;20-5 = -25%
+value	  = -15     ;20-3 = 17 = -15%
 reqs    =
     {
       "type", "name", "range","present"
diff --git a/freeciv/freeciv/data/mp2-dragoon/units.ruleset b/freeciv/freeciv/data/mp2-dragoon/units.ruleset
index 2692e297a..2220e6856 100644
--- a/freeciv/freeciv/data/mp2-dragoon/units.ruleset
+++ b/freeciv/freeciv/data/mp2-dragoon/units.ruleset
@@ -5132,7 +5132,7 @@ Goods are commodities.\
 Goods can be used to establish Trade Routes or Enter Marketplace. They can\
  be carried by Commerce units, allowing you to establish multiple\
  trade routes in one voyage. Also, Goods can Recycle Production with only\
- a 25% penalty, rendering 15 shields into a city production target. \n\
+ a 15% penalty, rendering 17 shields into a city production target. \n\
 "), _("\
 By themselves, Goods can only move onto tiles with a City, Quay, Fortress,\
  or Naval Base. Commerce units, Tribesmen, and Galleons must carry them as cargo.\