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

Added in [tileFilter] tiles conditional to combat uniques (#5393)

Browse Source 
* Some code cleaning

* Added `in [tileFilter] tiles` conditional

* Limited Visibility -> [-1] Sight

* Fix tests and rename conditional

* Actually made the conditional functional

* Renamed conditional once again
This commit is contained in:
Xander Lenstra
2021-10-04 21:30:09 +02:00
committed by GitHub
parent 2884cbb469
commit 82e72ddcfa
13 changed files with 127 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/assets/jsons/Civ V - Vanilla/Beliefs.json
View File

@ -248,7 +248,7 @@
{
"name": "Defender of the Faith",
"type": "Enhancer",
"uniques": ["[+20]% Strength for [All] units in [Friendly Land]"],
"uniques": ["[+20]% Strength <for [All] units> <when fighting in [Friendly Land] tiles>"],
// ToDo: Should only be friendly territory of cities that follow this religion
},
{
@ -264,7 +264,7 @@
{
"name": "Just War",
"type": "Enhancer",
"uniques": ["[+20]% Strength for [Non-City] units in [Enemy Land]"],
"uniques": ["[+20]% Strength <for [All] units> <when fighting in [Enemy Land] tiles>"],
// ToDo: Should only be enemy territory of cities that follow this religion
},
{

4
android/assets/jsons/Civ V - Vanilla/Buildings.json
View File

@ -194,7 +194,7 @@
"name": "Statue of Zeus",
"culture": 1,
"isWonder": true,
"uniques": ["+15% Combat Strength for all units when attacking Cities"],
"uniques": ["[+15]% Strength <for [All] units> <vs Cities> <when attacking>"],
"requiredTech": "Bronze Working",
"quote": "'He spoke, the son of Kronos, and nodded his head with the dark brows, and the immortally anointed hair of the great god swept from his divine head, and all Olympos was shaken' - The Iliad"
// "Requires [Honor]" in BNW
@ -767,7 +767,7 @@
"culture": 3,
"isWonder": true,
"greatPersonPoints": {"Great Engineer": 2},
"uniques": ["+[15]% Strength for [Non-City] units fighting in [Friendly Land]",
"uniques": ["[+15]% Strength <for [All] units> <when fighting in [Friendly Land] tiles>",
"Provides a free [Castle] [in this city]"],
"requiredTech": "Gunpowder",
"quote": "'Bushido is realized in the presence of death. This means choosing death whenever there is a choice between life and death. There is no other reasoning.' - Yamamoto Tsunetomo"

2
android/assets/jsons/Civ V - Vanilla/Policies.json
View File

@ -432,7 +432,7 @@
},
{
"name": "Nationalism",
"uniques": ["+[15]% Strength for [Non-City] units fighting in [Friendly Land]"],
"uniques": ["[+15]% Strength <for [All] units> <when fighting in [Friendly Land] tiles>"],
"row": 1,
"column": 5
},

26
android/assets/jsons/Civ V - Vanilla/UnitPromotions.json
View File

@ -9,37 +9,37 @@
// Ranged+Siege
{
"name": "Accuracy I",
"uniques": ["+[15]% Strength in [Open terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Open terrain] tiles> <when attacking>"],
"unitTypes": ["Siege","Archery","Ranged Gunpowder"]
},
{
"name": "Accuracy II",
"prerequisites": ["Accuracy I"],
"uniques": ["+[15]% Strength in [Open terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Open terrain] tiles> <when attacking>"],
"unitTypes": ["Siege","Archery","Ranged Gunpowder"]
},
{
"name": "Accuracy III",
"prerequisites": ["Accuracy II"],
"uniques": ["+[15]% Strength in [Open terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Open terrain] tiles> <when attacking>"],
"unitTypes": ["Siege","Archery","Ranged Gunpowder"]
},
{
"name": "Barrage I",
"uniques": ["+[15]% Strength in [Rough terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Rough terrain] tiles> <when attacking>"],
"unitTypes": ["Siege","Archery","Ranged Gunpowder"]
},
{
"name": "Barrage II",
"prerequisites": ["Barrage I"],
"uniques": ["+[15]% Strength in [Rough terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Rough terrain] tiles> <when attacking>"],
"unitTypes": ["Siege","Archery","Ranged Gunpowder"]
},
{
"name": "Barrage III",
"prerequisites": ["Barrage II"],
"uniques": ["+[15]% Strength in [Rough terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Rough terrain] tiles> <when attacking>"],
"unitTypes": ["Siege","Archery","Ranged Gunpowder"]
},
@ -65,37 +65,37 @@
// Melee, Mounted+Armor
{
"name": "Shock I",
"uniques": ["+[15]% Strength in [Open terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Open terrain] tiles>"],
"unitTypes": ["Sword","Gunpowder","Mounted","Armored"]
},
{
"name": "Shock II",
"prerequisites": ["Shock I"],
"uniques": ["+[15]% Strength in [Open terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Open terrain] tiles>"],
"unitTypes": ["Sword","Gunpowder","Mounted","Armored"]
},
{
"name": "Shock III",
"prerequisites": ["Shock II"],
"uniques": ["+[15]% Strength in [Open terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Open terrain] tiles>"],
"unitTypes": ["Sword","Gunpowder","Mounted","Armored"]
},
{
"name": "Drill I",
"uniques": ["+[15]% Strength in [Rough terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Rough terrain] tiles>"],
"unitTypes": ["Sword","Gunpowder","Mounted","Armored"]
},
{
"name": "Drill II",
"prerequisites": ["Drill I"],
"uniques": ["+[15]% Strength in [Rough terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Rough terrain] tiles>"],
"unitTypes": ["Sword","Gunpowder","Mounted","Armored"]
},
{
"name": "Drill III",
"prerequisites": ["Drill II"],
"uniques": ["+[15]% Strength in [Rough terrain]"],
"uniques": ["[+15]% Strength <when fighting in [Rough terrain] tiles>"],
"unitTypes": ["Sword","Gunpowder","Mounted","Armored"]
},
{
@ -537,7 +537,7 @@
},
{
"name": "Pictish Courage", // only for Pictish Warrior and subsequent upgrades
"uniques": ["No movement cost to pillage", "+[20]% Strength in [Foreign Land]"]
"uniques": ["No movement cost to pillage", "[+20]% Strength <when fighting in [Foreign Land] tiles>"]
},
{
"name": "Home Sweet Home", // only for Mehal Sefari and subsequent upgrades

34
android/assets/jsons/Civ V - Vanilla/Units.json
View File

@ -66,7 +66,7 @@
"strength": 8,
"cost": 40,
"obsoleteTech": "Metal Casting",
"uniques": ["+[33]% Strength in [Forest]", "+[33]% Strength in [Jungle]", "Heals [25] damage if it kills a unit"],
"uniques": ["[+33]% Strength <when fighting in [Forest] tiles>", "[+33]% Strength <when fighting in [Jungle] tiles>", "Heals [25] damage if it kills a unit"],
"promotions": ["Woodsman"],
"upgradesTo": "Swordsman",
"attackSound": "nonmetalhit"
@ -315,7 +315,7 @@
"requiredTech": "Bronze Working",
"obsoleteTech": "Physics",
"upgradesTo": "Trebuchet",
"uniques": ["[+300]% Strength <vs cities>", "No defensive terrain bonus", "[-33]% Strength <when defending>",
"uniques": ["[+300]% Strength <vs cities> <when attacking>", "No defensive terrain bonus", "[-33]% Strength <when defending>",
"[-1] Sight", "Can only attack [City] units"],
"promotions": ["Cover I"],
"attackSound": "throw"
@ -425,8 +425,8 @@
"requiredTech": "Mathematics",
"obsoleteTech": "Physics",
"upgradesTo": "Trebuchet",
"uniques": ["[+200]% Strength <vs cities>", "No defensive terrain bonus",
"Must set up to ranged attack", "Limited Visibility"],
"uniques": ["[+200]% Strength <vs cities> <when attacking>", "No defensive terrain bonus",
"Must set up to ranged attack", "[-1] Sight"],
"hurryCostModifier": 20,
"attackSound": "throw"
},
@ -442,8 +442,8 @@
"requiredTech": "Mathematics",
"obsoleteTech": "Physics",
"upgradesTo": "Trebuchet",
"uniques": ["[+200]% Strength <vs cities>", "No defensive terrain bonus",
"Must set up to ranged attack", "Limited Visibility"],
"uniques": ["[+200]% Strength <vs cities> <when attacking>", "No defensive terrain bonus",
"Must set up to ranged attack", "[-1] Sight"],
"hurryCostModifier": 20,
"attackSound": "throw"
},
@ -500,7 +500,7 @@
"upgradesTo": "Longswordsman",
"obsoleteTech": "Gunpowder",
"hurryCostModifier": 20,
"uniques": ["+[33]% Strength in [Forest]", "+[33]% Strength in [Jungle]"],
"uniques": ["[+33]% Strength <when fighting in [Forest] tiles>", "[+33]% Strength <when fighting in [Jungle] tiles>"],
"attackSound": "metalhit"
},
/*
@ -709,7 +709,7 @@
"requiredTech": "Physics",
"obsoleteTech": "Chemistry",
"upgradesTo": "Cannon",
"uniques": ["[+200]% Strength <vs cities>","No defensive terrain bonus","Must set up to ranged attack","Limited Visibility"],
"uniques": ["[+200]% Strength <vs cities> <when attacking>","No defensive terrain bonus","Must set up to ranged attack","[-1] Sight"],
"attackSound": "throw"
},
{
@ -985,7 +985,7 @@
"requiredTech": "Chemistry",
"upgradesTo": "Artillery",
"obsoleteTech": "Dynamite",
"uniques": ["[+200]% Strength <vs cities>","No defensive terrain bonus","Must set up to ranged attack","Limited Visibility"],
"uniques": ["[+200]% Strength <vs cities> <when attacking>","No defensive terrain bonus","Must set up to ranged attack","[-1] Sight"],
"attackSound": "cannon"
},
@ -1026,9 +1026,9 @@
"requiredTech": "Rifling",
"obsoleteTech": "Replaceable Parts",
"upgradesTo": "Great War Infantry",
"uniques": ["+[25]% Strength in [Snow]",
"+[25]% Strength in [Tundra]",
"+[25]% Strength in [Hill]",
"uniques": ["[+25]% Strength <when fighting in [Snow] tiles>",
"[+25]% Strength <when fighting in [Tundra] tiles>",
"[+25]% Strength <when fighting in [Hill] tiles>",
"Double movement in [Snow]",
"Double movement in [Tundra]",
"Double movement in [Hill]"],
@ -1130,8 +1130,8 @@
"cost": 320,
"requiredTech": "Dynamite",
"upgradesTo": "Rocket Artillery",
"uniques": ["[+200]% Strength <vs cities>","No defensive terrain bonus",
"Must set up to ranged attack","Limited Visibility","Ranged attacks may be performed over obstacles"],
"uniques": ["[+200]% Strength <vs cities> <when attacking>","No defensive terrain bonus",
"Must set up to ranged attack","[-1] Sight","Ranged attacks may be performed over obstacles"],
"attackSound": "artillery"
},
@ -1171,7 +1171,7 @@
"requiredTech": "Replaceable Parts",
"upgradesTo": "Infantry",
"obsoleteTech": "Plastics",
"uniques": ["+[20]% Strength in [Foreign Land]"],
"uniques": ["[+20]% Strength <when fighting in [Foreign Land] tiles>"],
"attackSound": "shot"
},
{
@ -1440,8 +1440,8 @@
"cost": 425,
"requiredTech": "Rocketry",
"requiredResource": "Aluminum",
"uniques": ["[+200]% Strength <vs cities>","No defensive terrain bonus",
"Limited Visibility","Ranged attacks may be performed over obstacles"],
"uniques": ["[+200]% Strength <vs cities> <when attacking>","No defensive terrain bonus",
"[-1] Sight","Ranged attacks may be performed over obstacles"],
"attackSound": "artillery"
},
{