Skip to content

Commit

Permalink
Tweaks, fixes and changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Ogliss committed May 23, 2021
1 parent e9b6e88 commit 9445c08
Show file tree
Hide file tree
Showing 42 changed files with 97 additions and 66 deletions.
Binary file modified 1.1/Assemblies/AdeptusMechanicusKroot.dll
Binary file not shown.
Binary file modified 1.1/Assemblies/AdeptusMechanicusKroot.pdb
Binary file not shown.
Binary file modified 1.1/Assemblies/AdeptusMechanicusTau.dll
Binary file not shown.
Binary file modified 1.1/Assemblies/AdeptusMechanicusTau.pdb
Binary file not shown.
Binary file modified 1.1/Assemblies/AdeptusMechanicusVespid.dll
Binary file not shown.
Binary file modified 1.1/Assemblies/AdeptusMechanicusVespid.pdb
Binary file not shown.
51 changes: 4 additions & 47 deletions 1.1/Defs/AbilityDefs/OG_AMXT_Abilities_JumpPack.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,51 +3,11 @@
<Defs>
<!-- ======================== Jump Pack Ability Defs ================================== -->
<!-- ======================== Imperial - Jump Ability ================================== -->
<ThingDef ParentName="BaseBullet">
<defName>FlyingObject_JumpPackTau</defName>
<thingClass>AdeptusMechanicus.FlyingObject_JumpPack</thingClass>
<label>jump</label>
<graphicData>
<texPath>DummyTexture</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>CutoutFlying</shaderType>
</graphicData>
<projectile>
<flyOverhead>true</flyOverhead>
<damageDef>Stun</damageDef>
<damageAmountBase>60</damageAmountBase>
<explosionRadius>2</explosionRadius>
<ThingDef ParentName="FlyingObject_JumpPack">
<defName>FlyingObject_JumpPackTau</defName>
<projectile>
<speed>15</speed>
</projectile>
<skyfaller>
<reversed>true</reversed>
<anticipationSound>Shuttle_Leaving</anticipationSound>
<anticipationSoundTicks>-10</anticipationSoundTicks>
<moteSpawnTime>0.05</moteSpawnTime>
<zPositionCurve>
<points>
<li>(0,0)</li>
<li>(0.5,10)</li>
<li>(0.9,10)</li>
<li>(1,0)</li>
</points>
</zPositionCurve>
<!--xPositionCurve>
<points>
<li>(0,0)</li>
<li>(0.5,5)</li>
<li>(1,0)</li>
</points>
</xPositionCurve-->
<speedCurve>
<points>
<li>(0,1)</li>
<li>(0.5,2)</li>
<li>(0.9,5)</li>
<li>(1,0)</li>
</points>
</speedCurve>
</skyfaller>
</projectile>
</ThingDef>


Expand Down Expand Up @@ -75,9 +35,6 @@
<li Class="AdeptusMechanicus.CompProperties_EquipmentAbilityJumpPack">
<compClass>AdeptusMechanicus.CompAbilityEffect_JumpPack</compClass>
<jumpingThing>FlyingObject_JumpPackTau</jumpingThing>
<psychic>false</psychic>
<goodwillImpact>0</goodwillImpact>
<screenShakeIntensity>0</screenShakeIntensity>
<stunTicks>70~120</stunTicks>
<!--explodingLeaperRadius>2.5</explodingLeaperRadius-->
<clamorRadius>5</clamorRadius>
Expand Down
4 changes: 2 additions & 2 deletions 1.1/Defs/FactionDefs/OG_AMXT_Factions_Tau.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<min>-60</min>
<max>60</max>
</startingGoodwill>
<factionNameMaker>NamerOGTauFaction</factionNameMaker>
<settlementNameMaker>NamerOGTauBases</settlementNameMaker>
<factionNameMaker>OG_Tau_NamerFaction</factionNameMaker>
<settlementNameMaker>OG_Tau_NamerBases</settlementNameMaker>
<techLevel>Spacer</techLevel>
<backstoryFilters>
<li>
Expand Down
4 changes: 2 additions & 2 deletions 1.1/Defs/FactionDefs/OG_AMXT_Factions_Tau_Player.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<basicMemberKind>Colonist_OG_Tau</basicMemberKind>
<pawnsPlural>colonists</pawnsPlural>
<playerInitialSettlementNameMaker>NamerInitialSettlementColony</playerInitialSettlementNameMaker>
<factionNameMaker>NamerOGTauFaction</factionNameMaker>
<settlementNameMaker>NamerOGTauBases</settlementNameMaker>
<factionNameMaker>OG_Tau_NamerFaction</factionNameMaker>
<settlementNameMaker>OG_Tau_NamerBases</settlementNameMaker>
<techLevel>Ultra</techLevel>
<backstoryFilters>
<li>
Expand Down
15 changes: 9 additions & 6 deletions 1.1/Defs/ThingDefs/OG_AMXT_Animal_Kroothound.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@
<texPath>Things/Pawn/Animals/KrootHound/Hound_Kroot</texPath>
<shaderType>CutoutComplex</shaderType>
<drawSize>0.75</drawSize>
<color>(96,172,70)</color>
<color>(17,76,46)</color>
<colorTwo>(221,160,99)</colorTwo>
</bodyGraphicData>
<dessicatedBodyGraphicData>
<texPath>Things/Pawn/Animal/Warg/Dessicated_Warg</texPath>
Expand All @@ -169,7 +170,8 @@
<texPath>Things/Pawn/Animals/KrootHound/Hound_Kroot</texPath>
<shaderType>CutoutComplex</shaderType>
<drawSize>1</drawSize>
<color>(96,172,70)</color>
<color>(17,76,46)</color>
<colorTwo>(221,160,99)</colorTwo>
<shadowData>
<volume>(0.25, 0.3, 0.25)</volume>
<offset>(0,0,-0.15)</offset>
Expand All @@ -184,16 +186,17 @@
<bodyGraphicData>
<texPath>Things/Pawn/Animals/KrootHound/Hound_Kroot</texPath>
<shaderType>CutoutComplex</shaderType>
<drawSize>2</drawSize>
<color>(96,172,70)</color>
<drawSize>1.75</drawSize>
<color>(17,76,46)</color>
<colorTwo>(221,160,99)</colorTwo>
<shadowData>
<volume>(0.3, 0.4, 0.3)</volume>
<offset>(0,0,-0.15)</offset>
</shadowData>
</bodyGraphicData>
<dessicatedBodyGraphicData>
<texPath>Things/Pawn/Animal/Warg/Dessicated_Warg</texPath>
<drawSize>2</drawSize>
<texPath>Things/Pawn/Animal/Warg/Dessicated_Warg</texPath>
<drawSize>2</drawSize>
</dessicatedBodyGraphicData>
</li>
</lifeStages>
Expand Down
9 changes: 9 additions & 0 deletions 1.1/Defs/ThingDefs/OG_AMXT_Animal_Krootox.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,10 @@
<labelPlural>Kroot Ox calves</labelPlural>
<bodyGraphicData>
<texPath>Things/Pawn/Animals/KrootOx/KrootOx</texPath>
<shaderType>CutoutComplex</shaderType>
<drawSize>1.5</drawSize>
<color>(17,76,46)</color>
<colorTwo>(221,160,99)</colorTwo>
<shadowData>
<volume>(0.4, 0.3, 0.3)</volume>
<offset>(0,0,-0.2)</offset>
Expand All @@ -152,7 +155,10 @@
<li>
<bodyGraphicData>
<texPath>Things/Pawn/Animals/KrootOx/KrootOx</texPath>
<shaderType>CutoutComplex</shaderType>
<drawSize>2.0</drawSize>
<color>(17,76,46)</color>
<colorTwo>(221,160,99)</colorTwo>
<shadowData>
<volume>(0.6, 0.45, 0.45)</volume>
<offset>(0,0,-0.25)</offset>
Expand All @@ -166,7 +172,10 @@
<li>
<bodyGraphicData>
<texPath>Things/Pawn/Animals/KrootOx/KrootOx</texPath>
<shaderType>CutoutComplex</shaderType>
<drawSize>2.5</drawSize>
<color>(17,76,46)</color>
<colorTwo>(221,160,99)</colorTwo>
<shadowData>
<volume>(0.8, 0.6, 0.6)</volume>
<offset>(0,0,-0.3)</offset>
Expand Down
3 changes: 1 addition & 2 deletions 1.1/Defs/ThingDefs/OG_AMXT_Kroot_Race.xml
Original file line number Diff line number Diff line change
Expand Up @@ -547,8 +547,7 @@
<makesFootprints>true</makesFootprints>
<lifeExpectancy>300</lifeExpectancy>
<leatherDef>Leather_Kroot</leatherDef>
<nameGenerator>OG_NamerPersonKroot_Male</nameGenerator>
<nameGeneratorFemale>OG_NamerPersonKroot_Female</nameGeneratorFemale>
<nameGenerator>OG_Kroot_NamerPerson</nameGenerator>
<body>OG_Kroot_Body</body>
<bloodDef>OG_FilthBlood_Kroot</bloodDef>
<meatColor>(35, 56, 0)</meatColor>
Expand Down
3 changes: 2 additions & 1 deletion 1.1/Defs/ThingDefs/OG_AMXT_Tau_Race.xml
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,8 @@
<makesFootprints>true</makesFootprints>
<lifeExpectancy>45</lifeExpectancy>
<leatherDef>Leather_Tau</leatherDef>
<nameGenerator>NamerOGTauPawns</nameGenerator>
<nameGenerator>OG_Tau_NamerPerson</nameGenerator>
<nameGeneratorFemale>OG_Tau_NamerPersonFemale</nameGeneratorFemale>
<body>OG_Tau_Body</body>
<bloodDef>OG_FilthBlood_Tau</bloodDef>
<meatColor>(200,135,100)</meatColor>
Expand Down
3 changes: 1 addition & 2 deletions 1.1/Defs/ThingDefs/OG_AMXT_Vespid_Race.xml
Original file line number Diff line number Diff line change
Expand Up @@ -517,8 +517,7 @@
<makesFootprints>true</makesFootprints>
<lifeExpectancy>300</lifeExpectancy>
<leatherDef>Leather_Kroot</leatherDef>
<nameGenerator>OG_NamerPersonKroot_Male</nameGenerator>
<nameGeneratorFemale>OG_NamerPersonKroot_Female</nameGeneratorFemale>
<nameGenerator>OG_Kroot_NamerPerson</nameGenerator>
<body>OG_Vespid_Body</body>
<bloodDef>OG_FilthBlood_Kroot</bloodDef>
<meatColor>(35, 56, 0)</meatColor>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 4 additions & 2 deletions About/About.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<li>Ogliss.FeralOrkz</li>
<li>Mlie.O21Rimhammer40K</li>
</incompatibleWith>
<description>V1.6.1.1
<description>V1.6.5.0
Adds plyable WH40k Tau
Requires new start or a faction manager mod to have faction bases on the world map.

Expand All @@ -51,6 +51,8 @@ Races:
Knarloc - Animal

Apparel:
Gue'vesa Combat Armour
Gue'vesa Combat Helmet
Tau Combat Armour
Tau Combat Helmet
Kroot Tribalwear
Expand Down Expand Up @@ -81,7 +83,7 @@ Load Order info:
Playable Orkz,Eldar,Tau( This Mod ),Etc( if used ) order doesnt matter

Credits:
Fennbold: Textures for
Fennbold/Emeraldwing: Textures for
Kroothound
Krootox

Expand Down
2 changes: 1 addition & 1 deletion About/Manifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>Ogliss.AdMech.Xenobiologis.Tau</identifier>
<version>1.6.1.1</version>
<version>1.6.5.0</version>
<dependencies>
<li>Ogliss.AdMech.Armoury</li>
<li>erdelf.HumanoidAlienRaces</li>
Expand Down
2 changes: 1 addition & 1 deletion About/Version.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<VersionData>
<overrideVersion>1.6</overrideVersion>
<overrideVersion>1.6.5.0</overrideVersion>
<gitHubRepository>Ogliss/AdMech-Xeno-AHR-Tau</gitHubRepository>
</VersionData>
61 changes: 61 additions & 0 deletions Defs/BackstoryDefs/OG_AMXT_Backstories_Kroot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,67 @@
</spawnCategories>
</AlienRace.BackstoryDef>

<!-- Assassin -->
<AlienRace.BackstoryDef>
<defName>OG_Kroot_Assassin</defName>
<title>assassin</title>
<titleShort>assassin</titleShort>
<baseDescription>[PAWN_nameDef] was a professional assassin. [PAWN_pronoun] natural ability to move unseen and unheard in jungles and woods was an asset, capable of silently infiltrating enemy encampments and waiting amongst the trees for days or weeks until the ideal moment to strike, and made a good profit. In this business, often hired for one off Assassination missions although sometimes kept for an extended period on a regular payment.</baseDescription>
<slot>Adulthood</slot>
<skillGains>
<li>
<defName>Melee</defName>
<amount>10</amount>
</li>
<li>
<defName>Shooting</defName>
<amount>10</amount>
</li>
</skillGains>
<spawnCategories>
<li>Kroot_Assassin</li>
<li>Kroot_Standard</li>
</spawnCategories>
<workDisables>
<li>Intellectual</li>
<li>ManualDumb</li>
<li>ManualSkilled</li>
<li>Social</li>
<li>Caring</li>
</workDisables>
<requiredWorkTags>
<li>Violent</li>
</requiredWorkTags>
<bodyTypeMale>Thin</bodyTypeMale>
<bodyTypeFemale>Thin</bodyTypeFemale>
<forcedTraits>
<li>
<defName>Psychopath</defName>
<chance>100</chance>
</li>
</forcedTraits>
</AlienRace.BackstoryDef>

<!-- Scum -->
<AlienRace.BackstoryDef>
<defName>OG_Kroot_Scum</defName>
<title>scum</title>
<titleShort>scum</titleShort>
<baseDescription>While it is uncommon for Kroot to be on a world without some sort of master providing regular payments, [PAWN_nameDef] stowed away on ships moving from world to world. [PAWN_pronoun] travelled often, taking up casual work wherever [PAWN_pronoun] found it.\n\nWhen [PAWN_pronoun] found a planet of choice, often a Feral World [PAWN_pronoun] would set up home within woodlands or jungle near a local community that [PAWN_pronoun] could terrorize to eke out survival.</baseDescription>
<slot>Adulthood</slot>
<skillGains>
<li><defName>Cooking</defName><amount>3</amount></li>
<li><defName>Construction</defName><amount>3</amount></li>
<li><defName>Artistic</defName><amount>-4</amount></li>
</skillGains>
<spawnCategories>
<li>Kroot_Scum</li>
<li>Kroot_Standard</li>
</spawnCategories>
<bodyTypeMale>Thin</bodyTypeMale>
<bodyTypeFemale>Thin</bodyTypeFemale>
</AlienRace.BackstoryDef>

<!-- Kroot Mutations -->
<!-- Hyperactive Nymune Organ Child -->
<AlienRace.BackstoryDef ParentName="Kroot_Base_Child">
Expand Down
Binary file modified Textures/Things/Pawn/Animals/KrootHound/Hound_Kroot_east.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.
Binary file modified Textures/Things/Pawn/Animals/KrootHound/Hound_Kroot_north.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.
Binary file modified Textures/Things/Pawn/Animals/KrootHound/Hound_Kroot_south.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.
Binary file modified Textures/Things/Pawn/Animals/KrootOx/KrootOxPack_east.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 modified Textures/Things/Pawn/Animals/KrootOx/KrootOxPack_north.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 not shown.
Binary file modified Textures/Things/Pawn/Animals/KrootOx/KrootOx_east.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.
Binary file modified Textures/Things/Pawn/Animals/KrootOx/KrootOx_north.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.
Binary file modified Textures/Things/Pawn/Animals/KrootOx/KrootOx_south.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.

0 comments on commit 9445c08

Please sign in to comment.