Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Major Bug fixes #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions art/actors/props/units/heads/ptol_quilted_b.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="base">
<color>234 234 234</color>
<mesh>props/new/dude_head.dae</mesh>
<textures><texture file="props/head/rome_veteran.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant name="hair-color-brown">
<color>255 205 125</color>
</variant>
<variant name="hair-color-brunette">
<color>184 151 98</color>
</variant>
<variant name="hair-color-black">
<color>8 8 8</color>
</variant>
<variant name="hair-color-blond">
<color>255 250 187</color>
</variant>
<variant name="hair-color-red">
<color>250 130 78</color>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant name="death">
<textures><texture file="props/head/rome_veteran_bloodied.dds" name="baseTex"/></textures>
</variant>
</group>
<material>objectcolor.xml</material>
</actor>
Binary file modified art/textures/ui/session/portraits/emblems/emblem_judeans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions mod.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "judeans",
"label": "0 A.D. Judeans",
"version": "1.0.0",
"version": "2.0.0",
"url": "https://github.com/0ADMods/judeans",
"description": "Judeans faction for 0 A.D.",
"description": "Judeans faction for 0 A.D. Edited by Yekaterina",
"dependencies": ["0ad>=0.0.24"],
"type": "civ"
}
26 changes: 13 additions & 13 deletions simulation/data/civs/jude.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,26 +43,26 @@
"Structures": [],
"WallSets": [
"other/wallset_palisade",
"structures/jude_wallset_stone"
"structures/jude/wallset_stone"
],
"StartEntities": [
{
"Template": "structures/jude_civil_centre"
"Template": "structures/jude/civil_centre"
},
{
"Template": "units/jude_support_female_citizen",
"Template": "units/jude/support_female_citizen",
"Count": 4
},
{
"Template": "units/jude_infantry_spearman_b",
"Template": "units/jude/infantry_spearman_b",
"Count": 2
},
{
"Template": "units/jude_infantry_slinger_b",
"Template": "units/jude/infantry_slinger_b",
"Count": 2
},
{
"Template": "units/jude_cavalry_javelinist_b"
"Template": "units/jude/cavalry_javelineer_b"
}
],
"Formations": [
Expand All @@ -86,13 +86,13 @@
"Mattathias"
],
"SkirmishReplacements": {
"skirmish/units/default_infantry_ranged_b": "units/jude_infantry_slinger_b",
"skirmish/structures/default_house_10": "structures/{civ}_house",
"skirmish/structures/default_wall_tower": "",
"skirmish/structures/default_wall_gate": "",
"skirmish/structures/default_wall_short": "",
"skirmish/structures/default_wall_medium": "",
"skirmish/structures/default_wall_long": ""
"skirmish/units/default/infantry_ranged_b": "units/jude/infantry_slinger_b",
"skirmish/structures/default/house_10": "structures/jude/house",
"skirmish/structures/default/wall_tower": "units/jude/wall_tower",
"skirmish/structures/default/wall_gate": "units/jude/wall_gate",
"skirmish/structures/default/wall_short": "units/jude/wall_short",
"skirmish/structures/default/wall_medium": "units/jude/wall_medium",
"skirmish/structures/default/wall_long": "units/jude/wall_long"
},
"SelectableInGameSetup": true
}
29 changes: 29 additions & 0 deletions simulation/data/technologies/archery_tradition.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"genericName": "Archery Tradition",
"description": "The Indian, Iranian, and Kushite peoples had a tradition of fine archery and a penchant for using massed archers in battle.",
"cost": {
"food": 400,
"metal": 200
},
"requirements": {
"all": [
{ "tech": "phase_village" },
{
"any": [
{ "civ": "kush" },
{ "civ": "maur" },
{ "civ": "pers" }
]
}
]
},
"requirementsTooltip": "Unlocked in Village Phase.",
"icon": "archery_tradition.png",
"researchTime": 40,
"tooltip": "Archers +10 attack range.",
"modifications": [
{ "value": "Attack/Ranged/MaxRange", "add": 10 }
],
"affects": ["Archer"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
17 changes: 17 additions & 0 deletions simulation/data/technologies/siege_armor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"genericName": "Armor Plating",
"description": "Cover the exterior with iron plates to protect against fire and projectiles.",
"cost": {
"metal": 600
},
"requirements": { "tech": "phase_city" },
"requirementsTooltip": "Unlocked in City Phase.",
"icon": "armor_plates_gold.png",
"researchTime": 40,
"tooltip": "Battering Rams and Siege Towers +25% health.",
"modifications": [
{ "value": "Health/Max", "multiply": 1.25 }
],
"affects": ["Ram", "SiegeTower"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
23 changes: 23 additions & 0 deletions simulation/data/technologies/siege_attack.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"genericName": "Advanced Siege",
"description": "Advanced technologies improve siege efficiency.",
"cost": {
"wood": 800,
"metal": 500
},
"requirements": {
"all": [
{ "tech": "phase_city" }
]
},
"requirementsTooltip": "Unlocked in City Phase.",
"icon": "siege_ram.png",
"researchTime": 40,
"tooltip": "Siege Engines +25% attack crush damage.",
"modifications": [
{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.25 },
{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.25 }
],
"affects": ["Siege"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
28 changes: 28 additions & 0 deletions simulation/data/technologies/siege_bolt_accuracy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"genericName": "Bolt Accuracy",
"description": "Improvement to projectile accuracy.",
"cost": {
"wood": 250,
"metal": 250
},
"requirements": {
"all": [
{ "tech": "phase_city" },
{ "notciv": "brit" },
{ "notciv": "gaul" },
{ "notciv": "iber" },
{ "notciv": "maur" },
{ "notciv": "pers" },
{ "notciv": "sele" }
]
},
"requirementsTooltip": "Unlocked in City Phase.",
"icon": "accuracy_bolt.png",
"researchTime": 40,
"tooltip": "Bolt Shooters −20% ranged attack spread.",
"modifications": [
{ "value": "Attack/Ranged/Spread", "multiply": 0.8 }
],
"affects": ["BoltShooter"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
17 changes: 17 additions & 0 deletions simulation/data/technologies/siege_cost_metal.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"genericName": "Siegecraft",
"description": "The science or craft of laying or carrying out sieges.",
"cost": {
"wood": 600
},
"requirements": { "tech": "phase_city" },
"requirementsTooltip": "Unlocked in City Phase.",
"icon": "engineering.png",
"researchTime": 40,
"tooltip": "Siege Engines −20% metal cost",
"modifications": [
{ "value": "Cost/metal", "multiply": 0.8 }
],
"affects": ["Siege"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
17 changes: 17 additions & 0 deletions simulation/data/technologies/siege_cost_wood.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"genericName": "Siegecraft",
"description": "The science or craft of laying or carrying out sieges.",
"cost": {
"stone": 600
},
"requirements": { "tech": "phase_city" },
"requirementsTooltip": "Unlocked in City Phase.",
"icon": "engineering.png",
"researchTime": 40,
"tooltip": "Siege Engines −20% wood cost",
"modifications": [
{ "value": "Cost/wood", "multiply": 0.8 }
],
"affects": ["Siege"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
27 changes: 27 additions & 0 deletions simulation/data/technologies/siege_pack_unpack.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"genericName": "Military Engineers",
"description": "Military engineers are responsible for improvements in siege engines.",
"cost": {
"food": 800
},
"requirements": {
"all": [
{ "tech": "phase_city" },
{ "notciv": "brit" },
{ "notciv": "gaul" },
{ "notciv": "iber" },
{ "notciv": "maur" },
{ "notciv": "kush" },
{ "notciv": "pers" }
]
},
"requirementsTooltip": "Unlocked in City Phase.",
"icon": "military_engineers.png",
"researchTime": 40,
"tooltip": "Siege Engines –40% pack and unpack time.",
"modifications": [
{ "value": "Pack/Time", "multiply": 0.6 }
],
"affects": ["Siege"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_structure_military_workshop">
<Entity parent="template_structure_military_arsenal">
<Identity>
<Civ>jude</Civ>
<SpecificName></SpecificName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
</Identity>
<ProductionQueue>
<Entities datatype="tokens">
units/{civ}_infantry_spearman_b
units/{civ}_infantry_slinger_b
units/{civ}_cavalry_javelinist_b
units/{civ}/infantry_spearman_b
units/{civ}/infantry_slinger_b
units/{civ}/cavalry_javelinist_b
</Entities>
</ProductionQueue>
<VisualActor>
Expand Down
20 changes: 20 additions & 0 deletions simulation/templates/structures/jude/defense_tower.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_structure_defensive_tower_stone">
<Footprint>
<Square width="10.0" depth="10.5"/>
<Height>15.0</Height>
</Footprint>
<Identity>
<Civ>jude</Civ>
<SpecificName></SpecificName>
</Identity>
<Obstruction>
<Static width="7.0" depth="8.0"/>
</Obstruction>
<StatusBars>
<HeightOffset>22.0</HeightOffset>
</StatusBars>
<VisualActor>
<Actor>structures/seleucids/scout_tower.xml</Actor>
</VisualActor>
</Entity>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_structure_military_blacksmith">
<Entity parent="template_structure_military_forge">
<Identity>
<Civ>jude</Civ>
<SpecificName></SpecificName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,9 @@
</Obstruction>
<ProductionQueue>
<Entities datatype="tokens">
units/{civ}_hero_judah
units/{civ}_champion_infantry_swordsman
units/{civ}/hero_judah
</Entities>
<Technologies datatype="tokens">
siege_attack
siege_armor
siege_cost_metal
siege_cost_wood
</Technologies>

</ProductionQueue>
<VisualActor>
<Actor>structures/seleucids/fortress.xml</Actor>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_structure_defensive_tower_outpost">
<Entity parent="template_structure_defensive_outpost">
<Identity>
<Civ>jude</Civ>
<SpecificName></SpecificName>
Expand Down
24 changes: 24 additions & 0 deletions simulation/templates/structures/jude/wall_gate.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_structure_defensive_wall_gate">
<Footprint>
<Square width="39.0" depth="8.0"/>
<Height>9.0</Height>
</Footprint>
<Identity>
<Civ>jude</Civ>
<SpecificName></SpecificName>
</Identity>
<Obstruction>
<Obstructions>
<Right width="12" depth="6.5" x="12.5" z="0"/>
<Left width="12" depth="6.5" x="-12.5" z="0"/>
<Door width="13" depth="6.5" x="0" z="0"/>
</Obstructions>
</Obstruction>
<VisualActor>
<Actor>structures/seleucids/wall_gate.xml</Actor>
</VisualActor>
<WallPiece>
<Length>33.0</Length>
</WallPiece>
</Entity>
21 changes: 21 additions & 0 deletions simulation/templates/structures/jude/wall_long.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_structure_defensive_wall_long">
<Footprint>
<Square width="35.5" depth="7.0"/>
<Height>9.0</Height>
</Footprint>
<Identity>
<Civ>jude</Civ>
<SelectionGroupName>structures/jude_wallset_stone</SelectionGroupName>
<SpecificName></SpecificName>
</Identity>
<Obstruction>
<Static width="34.0" depth="6.0"/>
</Obstruction>
<VisualActor>
<Actor>structures/seleucids/wall_long.xml</Actor>
</VisualActor>
<WallPiece>
<Length>33.2</Length>
</WallPiece>
</Entity>
Loading