Skip to content

Commit

Permalink
Merge pull request #173 from AlatarTheYoung/master
Browse files Browse the repository at this point in the history
Addition of cities tiles for the small people and icons for the cadari republik
  • Loading branch information
Caballero-Arepa authored Jul 28, 2024
2 parents 410541e + 6a14e93 commit 90d3a98
Show file tree
Hide file tree
Showing 33 changed files with 463 additions and 337 deletions.
Binary file modified Images/BuildingIcons/Battle Fortress.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/BuildingIcons/Freeport.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/BuildingIcons/Hero Statue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/BuildingIcons/Ikea.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/BuildingIcons/Military Lab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/BuildingIcons/Mobilization Center.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/ImprovementIcons/Cacti Farm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/NationIcons/Cadari Republik.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/NationIcons/Exclamation Point Empire.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/NationIcons/Nukaruzania.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/NationIcons/Rakhvia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/NationIcons/San Andor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/UnitIcons/Artillery Tank.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/UnitIcons/Independence Warrior.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/UnitIcons/Jeep.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/UnitIcons/Patriot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/UnitIcons/Round Tank.png
Binary file added Images/UnitIcons/Stormer.png
Binary file added Images/UnitIcons/Swordshocker.png
618 changes: 372 additions & 246 deletions game.atlas

Large diffs are not rendered by default.

Binary file modified game3.png
20 changes: 10 additions & 10 deletions jsons/Buildings.json
Original file line number Diff line number Diff line change
Expand Up @@ -274,16 +274,16 @@
},

// Ravignir
{
"name": "Clown Alley",
"replaces": "Colosseum",
"uniqueTo": "Clownish Commonwealth",
"happiness": 2,
"gold": 2,
"maintenance": 0,
"hurryCostModifier": 0,
"requiredTech": "Construction",
},
// {
// "name": "Clown Alley",
// "replaces": "Colosseum",
// "uniqueTo": "Clownish Commonwealth",
// "happiness": 2,
// "gold": 2,
// "maintenance": 0,
// "hurryCostModifier": 0,
// "requiredTech": "Construction",
// },

//Arkistia
{
Expand Down
110 changes: 55 additions & 55 deletions jsons/Nations.json
Original file line number Diff line number Diff line change
Expand Up @@ -513,36 +513,36 @@
"Riqua","Gabbal","Hafingareo","Xear","Heron", "Entilsted","Urmam","Far","Jeks","How-here","Finnal"]
},
//What should everyone calk you?
{
"name": "Sharded Civ",
"leaderName": "Alpha-2",
"adjective": ["Former Galactic"],
"startBias": ["Tundra"],
"preferredVictoryType": "Scientific",


"startIntroPart1": "Greetings, I'm Alpha-2 from sharded empire im not from the earth im from another galaxy but our last planet was blown into pieces...",
"startIntroPart2": "So we have to survive to rebuild our empire back.",

"introduction": "Hi.",
"declaringWar": "Die!",
"attacked": "Why why are u doin this?\nSo u have chosen death.",
"afterPeace": "Finnaly peace\nI dont like u.",
"defeated": "Nooooo :(",
"neutralHello": "Hello my friend, wanna trade with me?",
"hateHello": "Get lost!",
"tradeRequest": "Hi, wanna trade?",

"outerColor": [87, 113, 108],
"innerColor": [69, 204, 48],

"uniqueName": "Type 3 civilization",
"uniques": ["[+20]% Strength <for [Military] units> <when fighting in [Snow] tiles>", "[+20]% Strength <for [Military] units> <when fighting in [Tundra] tiles>"],
"cities":["Alpha-1","Alpha-2","Alpha-3","Alpha-4","Alpha-5","Alpha-6","Alpha-7","Alpha-8","Alpha-9","Alpha-10",
"Courseor","Arthurstead","Lexinhome","Derringer","Charlett","Boltzer","Vyper","Frosht","Jevinia","Kessel",
"Aaras","Clouse","Dustmug","Greenray","Jaxinia","Harkir","Mootual","Babelo","Donesi","Inan","Barron",
"Riqua","Gabbal","Hafingareo","Xear","Heron", "Entilsted","Urmam","Far","Jeks","How-here","Finnal"]
},
//{
// "name": "Sharded Civ",
// "leaderName": "Alpha-2",
// "adjective": ["Former Galactic"],
// "startBias": ["Tundra"],
// "preferredVictoryType": "Scientific",
//
//
// "startIntroPart1": "Greetings, I'm Alpha-2 from sharded empire im not from the earth im from another galaxy but our last planet was blown into pieces...",
// "startIntroPart2": "So we have to survive to rebuild our empire back.",
//
// "introduction": "Hi.",
// "declaringWar": "Die!",
// "attacked": "Why why are u doin this?\nSo u have chosen death.",
// "afterPeace": "Finnaly peace\nI dont like u.",
// "defeated": "Nooooo :(",
// "neutralHello": "Hello my friend, wanna trade with me?",
// "hateHello": "Get lost!",
// "tradeRequest": "Hi, wanna trade?",
//
// "outerColor": [87, 113, 108],
// "innerColor": [69, 204, 48],
//
// "uniqueName": "Type 3 civilization",
// "uniques": ["[+20]% Strength <for [Military] units> <when fighting in [Snow] tiles>", "[+20]% Strength <for [Military] units> <when fighting in [Tundra] tiles>"],
// "cities":["Alpha-1","Alpha-2","Alpha-3","Alpha-4","Alpha-5","Alpha-6","Alpha-7","Alpha-8","Alpha-9","Alpha-10",
// "Courseor","Arthurstead","Lexinhome","Derringer","Charlett","Boltzer","Vyper","Frosht","Jevinia","Kessel",
// "Aaras","Clouse","Dustmug","Greenray","Jaxinia","Harkir","Mootual","Babelo","Donesi","Inan","Barron",
// "Riqua","Gabbal","Hafingareo","Xear","Heron", "Entilsted","Urmam","Far","Jeks","How-here","Finnal"]
// },

// Letstalkaboutdune
{
Expand Down Expand Up @@ -657,31 +657,31 @@
},

// Ravignir
{
"name": "Clownish Commonwealth",
"leaderName": "Ravignir",
"adjective": ["Funny"],
"startBias": ["Avoid [Coast]"],
"preferredVictoryType": "Scientific",

"startIntroPart1": "Welcome, O'Great Conqueror, the Destroyer of Hopes, the Unstoppable Scientist and amongst all - the Master of Clowns.",
"startIntroPart2": "You'are trully a legend, Your name causes people to tremble. Can you live up to it? Can you reign supreme over the world?",

"introduction": "Good day, let's be friends uWu",
"declaringWar": "Sorry, I had to XDDD",
"attacked": "Lol, just die XDDD",
"defeated": "Do I look like a clown?. Apparently, so.",
"neutralHello": "Yes?",
"hateHello": "!?!?!",
"tradeRequest": "Sure, I've got some free candies in my van... Come on, hop inside, don't be shy!",

"outerColor": [39, 17, 51],
"innerColor": [181, 211, 255],

"uniqueName": "Clownfiesta",
"uniques": ["[+1] Sight <for [Scout] units>","[Scout] units gain the [Quick Study] promotion","City-State territory always counts as friendly territory","Will not be chosen for new games"],
"cities":["No'El","Vir Ehing","Rav Gerrak","O'Negai","Na'Arua","Gor Irdur","Vak Eloen","Yuub Onae'U","U'Pran"],
},
// {
// "name": "Clownish Commonwealth",
// "leaderName": "Ravignir",
// "adjective": ["Funny"],
// "startBias": ["Avoid [Coast]"],
// "preferredVictoryType": "Scientific",

// "startIntroPart1": "Welcome, O'Great Conqueror, the Destroyer of Hopes, the Unstoppable Scientist and amongst all - the Master of Clowns.",
// "startIntroPart2": "You'are trully a legend, Your name causes people to tremble. Can you live up to it? Can you reign supreme over the world?",
//
// "introduction": "Good day, let's be friends uWu",
// "declaringWar": "Sorry, I had to XDDD",
// "attacked": "Lol, just die XDDD",
// "defeated": "Do I look like a clown?. Apparently, so.",
// "neutralHello": "Yes?",
// "hateHello": "!?!?!",
// "tradeRequest": "Sure, I've got some free candies in my van... Come on, hop inside, don't be shy!",
//
// "outerColor": [39, 17, 51],
// "innerColor": [181, 211, 255],
//
// "uniqueName": "Clownfiesta",
// "uniques": ["[+1] Sight <for [Scout] units>","[Scout] units gain the [Quick Study] promotion","City-State territory always counts as friendly territory","Will not be chosen for new games"],
// "cities":["No'El","Vir Ehing","Rav Gerrak","O'Negai","Na'Arua","Gor Irdur","Vak Eloen","Yuub Onae'U","U'Pran"],
// },
{
"name": "Principality of Vinroth",
"leaderName": "Veldreth",
Expand Down
52 changes: 26 additions & 26 deletions jsons/Units.json
Original file line number Diff line number Diff line change
Expand Up @@ -308,32 +308,32 @@
},

// Ravignir
{
"name": "Unicycle Clown",
"replaces": "Chariot Archer",
"uniqueTo": "Clownish Commonwealth",
"unitType": "Archery",
"movement": 4,
"strength": 6,
"rangedStrength": 10,
"cost": 56,
"requiredTech": "The Wheel",
"upgradesTo": "Crossbowman",
"obsoleteTech": "Machinery",
"uniques": ["No defensive terrain bonus", "Rough terrain penalty", "Never appears as a Barbarian unit","Can transform to [Berserk Clown]"],
"attackSound": "elephant"
},
{
"name": "Berserk Clown",
"unitType": "Mounted",
"movement": 4,
"strength": 9,
"cost": 56,
"upgradesTo": "Knight",
"obsoleteTech": "Chivalry",
"uniques": ["No defensive terrain bonus", "Unbuildable", "Cannot be purchased", "Never appears as a Barbarian unit","Can transform to [Unicycle Clown]"],
"attackSound": "elephant"
},
// {
// "name": "Unicycle Clown",
// "replaces": "Chariot Archer",
// "uniqueTo": "Clownish Commonwealth",
// "unitType": "Archery",
// "movement": 4,
// "strength": 6,
// "rangedStrength": 10,
// "cost": 56,
// "requiredTech": "The Wheel",
// "upgradesTo": "Crossbowman",
// "obsoleteTech": "Machinery",
// "uniques": ["No defensive terrain bonus", "Rough terrain penalty", "Never appears as a Barbarian unit","Can transform to [Berserk Clown]"],
// "attackSound": "elephant"
// },
// {
// "name": "Berserk Clown",
// "unitType": "Mounted",
// "movement": 4,
// "strength": 9,
// "cost": 56,
// "upgradesTo": "Knight",
// "obsoleteTech": "Chivalry",
// "uniques": ["No defensive terrain bonus", "Unbuildable", "Cannot be purchased", "Never appears as a Barbarian unit","Can transform to [Unicycle Clown]"],
// "attackSound": "elephant"
// },
{
"name": "Bounty Hunter",
"unitType": "Gunpowder",
Expand Down

0 comments on commit 90d3a98

Please sign in to comment.