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

Added a way to add moddable constants (#5921)

Browse Source 
* Added a way to add moddable constants to unciv

* Fixed xp from barbarians problem

* Maybe I should test my code before pushing
This commit is contained in:
Xander Lenstra
2022-01-09 20:40:41 +01:00
committed by GitHub
parent 44b262ec52
commit fc287bd9f3
4 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -417,7 +417,8 @@ object Battle {
private fun addXp(thisCombatant: ICombatant, amount: Int, otherCombatant: ICombatant) {
var baseXP = amount
if (thisCombatant !is MapUnitCombatant) return
if (thisCombatant.unit.promotions.totalXpProduced() >= thisCombatant.unit.civInfo.gameInfo.ruleSet.modOptions.maxXPfromBarbarians
val modConstants = thisCombatant.unit.civInfo.gameInfo.ruleSet.modOptions.constants
if (thisCombatant.unit.promotions.totalXpProduced() >= modConstants.maxXPfromBarbarians
&& otherCombatant.getCivInfo().isBarbarian()
) {
return

3
core/src/com/unciv/logic/battle/CityCombatant.kt
View File

@ -37,6 +37,7 @@ class CityCombatant(val city: CityInfo) : ICombatant {
}
fun getCityStrength(): Int { // Civ fanatics forum, from a modder who went through the original code
val modConstants = getCivInfo().gameInfo.ruleSet.modOptions.constants
var strength = 8f
strength += (city.population.population / 5) * 2 // Each 5 pop gives 2 defence
val cityTile = city.getCenterTile()
@ -45,7 +46,7 @@ class CityCombatant(val city: CityInfo) : ICombatant {
// as tech progresses so does city strength
val techCount = getCivInfo().gameInfo.ruleSet.technologies.count()
val techsPercentKnown: Float = if (techCount > 0) city.civInfo.tech.techsResearched.count().toFloat() / techCount else 0.5f // for mods with no tech
strength += (techsPercentKnown * 5.5).pow(2.8).toFloat()
strength += (techsPercentKnown * modConstants.cityStrengthFromTechsMultiplier).pow(modConstants.cityStrengthFromTechsExponent).toFloat()
// The way all of this adds up...

13
core/src/com/unciv/models/ModConstants.kt Normal file
View File

@ -0,0 +1,13 @@
package com.unciv.models
class ModConstants {
// Max amount of experience that can be gained from combat with barbarians
var maxXPfromBarbarians = 30
// Formula for city Strength:
// Strength = baseStrength * (%techs * multiplier) ^ exponent
// If no techs exist in this ruleset, %techs = 0.5
val cityStrengthFromTechsMultiplier = 5.5
val cityStrengthFromTechsExponent = 2.8
}

10
core/src/com/unciv/models/ruleset/Ruleset.kt
View File

@ -5,6 +5,7 @@ import com.badlogic.gdx.files.FileHandle
import com.unciv.JsonParser
import com.unciv.logic.UncivShowableException
import com.unciv.models.Counter
import com.unciv.models.ModConstants
import com.unciv.models.metadata.BaseRuleset
import com.unciv.models.ruleset.tech.TechColumn
import com.unciv.models.ruleset.tech.Technology
@ -46,6 +47,7 @@ class ModOptions : IHasUniques {
var author = ""
var modSize = 0
@Deprecated("As of 3.18.15")
val maxXPfromBarbarians = 30
override var uniques = ArrayList<String>()
@ -53,6 +55,8 @@ class ModOptions : IHasUniques {
override var uniqueObjects: List<Unique> = listOf()
override fun getUniqueTarget() = UniqueTarget.ModOptions
val constants = ModConstants()
}
class Ruleset {
@ -155,6 +159,8 @@ class Ruleset {
if (modOptionsFile.exists()) {
try {
modOptions = jsonParser.getFromJson(ModOptions::class.java, modOptionsFile)
if (modOptions.maxXPfromBarbarians != 30)
modOptions.constants.maxXPfromBarbarians = modOptions.constants.maxXPfromBarbarians
} catch (ex: Exception) {}
modOptions.uniqueObjects = modOptions.uniques.map { Unique(it, UniqueTarget.ModOptions) }
}
@ -604,6 +610,10 @@ class Ruleset {
for (unitType in unitTypes.values) {
checkUniques(unitType, lines, UniqueType.UniqueComplianceErrorSeverity.RulesetSpecific)
}
if (modOptions.maxXPfromBarbarians != 30) {
lines.add("maxXPfromBarbarians is moved to the constants object, instead use: \nconstants: {\n maxXPfromBarbarians: ${modOptions.maxXPfromBarbarians},\n}", RulesetErrorSeverity.Warning)
}
return lines
}