mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-04 23:40:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

Giving the AI good trades is stored as credit (#11326)

Browse Source 
* AI Civs now are happy for good trades

* Each gift point is worth 100 gold without inflation

* Gifts can now be used as credit for future trades

* Fixed giftAmount conversions

* Fixed get inflation returning NAN when gpt is negative

* diplomatic gifts are now rounded when checking trade acceptability

* Changed gold gift scaling to account for relationship level

* Fixed percent based value reduction

* Added gold gifting functions to DiplomacyManager

* Added tests

* Declaring war removes gold gifts

* Reversed trade evaluation

* Added more tests for trading

* Fixed who the gifts are given to

* Added more comments

* Added more tests and fixed stuff

* Gifting does not occur with trade treaties

* Renamed handleGoldGifted to GiftGold

* Added two more tests

* Improved comments

* Liberating a civ no longer gives positive relations from open borders
This commit is contained in:
Oskar Niesen
2024-06-14 09:38:54 -05:00
committed by GitHub
parent 4257f9dbc7
commit 728713dc3e
8 changed files with 226 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
tests/src/com/unciv/logic/civilization/diplomacy/GoldGiftingTests.kt Normal file
View File

@ -0,0 +1,138 @@
package com.unciv.logic.civilization.diplomacy
import com.unciv.logic.civilization.diplomacy.DiplomacyTurnManager.nextTurn
import com.unciv.logic.trade.TradeEvaluation
import com.unciv.logic.trade.TradeLogic
import com.unciv.logic.trade.TradeOffer
import com.unciv.logic.trade.TradeType
import com.unciv.testing.GdxTestRunner
import com.unciv.testing.TestGame
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
@RunWith(GdxTestRunner::class)
class GoldGiftingTests {
private val testGame = TestGame()
private val a = testGame.addCiv()
private val b = testGame.addCiv()
lateinit var aDiplomacy: DiplomacyManager
lateinit var bDiplomacy: DiplomacyManager
@Before
fun setUp() {
a.diplomacyFunctions.makeCivilizationsMeet(b)
aDiplomacy = a.getDiplomacyManager(b)
bDiplomacy = b.getDiplomacyManager(a)
}
@Test
fun `Gold Gift Recieve Test` () {
assertEquals(0, aDiplomacy.getGoldGifts())
assertEquals(0, bDiplomacy.getGoldGifts())
aDiplomacy.recieveGoldGifts(10)
assertTrue(aDiplomacy.getGoldGifts() > 0)
assertEquals(0, bDiplomacy.getGoldGifts())
}
@Test
fun `Gold Gift Test` () {
assertEquals(0, aDiplomacy.getGoldGifts())
assertEquals(0, bDiplomacy.getGoldGifts())
aDiplomacy.giftGold(10)
assertTrue(aDiplomacy.getGoldGifts() > 0)
assertEquals(0, bDiplomacy.getGoldGifts())
}
@Test
fun `Gifted Gold Disapears` () {
aDiplomacy.recieveGoldGifts(10)
assertTrue(aDiplomacy.getGoldGifts() > 0)
val gold = aDiplomacy.getGoldGifts()
aDiplomacy.nextTurn()
val gold2 = aDiplomacy.getGoldGifts()
assertTrue(gold > gold2)
assertTrue(gold2 >= 0) // Gold should not be negative
// We don't actually test if the gift has completely run out
// since that may change in the future
}
@Test
fun `Gifted Gold is reduced less than 10 percent` () {
aDiplomacy.recieveGoldGifts(1000)
assertTrue(aDiplomacy.getGoldGifts() > 0)
val gold = aDiplomacy.getGoldGifts()
aDiplomacy.nextTurn()
val gold2 = aDiplomacy.getGoldGifts()
assertTrue(gold > gold2)
assertTrue(gold2 >= gold * .9) // We shoulden't loose more than 10% of the value in one turn
assertTrue(gold2 >= 0)
}
@Test
fun `Gold gifted is lost during war` () {
aDiplomacy.recieveGoldGifts(1000)
bDiplomacy.recieveGoldGifts(1000)
assertTrue(aDiplomacy.getGoldGifts() > 0)
assertTrue(bDiplomacy.getGoldGifts() > 0)
bDiplomacy.declareWar()
assertEquals(0, aDiplomacy.getGoldGifts())
assertTrue(bDiplomacy.getGoldGifts() > 0)
}
@Test
fun `Gifting gold reduces previous gifts taken` () {
aDiplomacy.giftGold(1000)
bDiplomacy.giftGold(500)
assertTrue(aDiplomacy.getGoldGifts() > 0)
assertTrue(aDiplomacy.getGoldGifts() < 1000)
assertTrue(bDiplomacy.getGoldGifts() == 0)
}
@Test
fun `Excess gold from a trade become a gift` () {
a.addGold(1000)
assertEquals(0, bDiplomacy.getGoldGifts())
val tradeOffer = TradeLogic(a,b)
tradeOffer.currentTrade.ourOffers.add(tradeOffer.ourAvailableOffers.first { it.type == TradeType.Gold })
assertTrue(TradeEvaluation().getTradeAcceptability(tradeOffer.currentTrade.reverse(), b,a,false) > 0)
tradeOffer.acceptTrade()
assertEquals(0, aDiplomacy.getGoldGifts())
assertTrue(bDiplomacy.getGoldGifts() > 0)
}
@Test
fun `Can ask for 90 percent of gold gift back again a turn later` () {
// Due to rounding, we aren't going to assume we can get 100% of the gold back
// Therefore we only test for 90%
a.addGold(1000)
val tradeOffer = TradeLogic(a,b)
tradeOffer.currentTrade.ourOffers.add(tradeOffer.ourAvailableOffers.first { it.type == TradeType.Gold })
tradeOffer.acceptTrade()
bDiplomacy.nextTurn()
val tradeOffer2 = TradeLogic(a,b)
tradeOffer2.currentTrade.theirOffers.add(TradeOffer("Gold", TradeType.Gold, 900))
assertTrue(TradeEvaluation().getTradeAcceptability(tradeOffer.currentTrade.reverse(), b,a,false) > 0)
tradeOffer2.acceptTrade()
assertTrue(bDiplomacy.getGoldGifts() >= 0) // Must not be negative
}
@Test
fun `Gold gifted impact trade acceptability`() {
a.addGold(1000)
val tradeOffer = TradeLogic(a,b)
tradeOffer.currentTrade.ourOffers.add(tradeOffer.ourAvailableOffers.first { it.type == TradeType.Gold })
assertTrue(TradeEvaluation().getTradeAcceptability(tradeOffer.currentTrade, b,a,true) < 0)
tradeOffer.acceptTrade()
val tradeOffer2 = TradeLogic(a,b)
assertTrue(TradeEvaluation().getTradeAcceptability(tradeOffer2.currentTrade.reverse(), b,a,true) > 0)
}
}