Skip to content

Commit

Permalink
Bugfixes, texture fixes... many fixes...
Browse files Browse the repository at this point in the history
  • Loading branch information
RecompiledBirds committed Jul 28, 2022
1 parent 581594f commit abe3de7
Show file tree
Hide file tree
Showing 682 changed files with 753 additions and 375 deletions.
Binary file modified 1.3/Assemblies/RimVali_Far_From_Avalon.dll
Binary file not shown.
16 changes: 8 additions & 8 deletions 1.3/Defs/Apparel/ApparelBody.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</recipeMaker>

<graphicData>
<texPath>avali/Things/Apparel/TraditionalWear/TraditionalWear_Avali_south</texPath>
<texPath>RimValiFFA/Things/Apparel/TraditionalWear/TraditionalWear_Avali_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
<drawSize>1.00</drawSize>
<shaderType>CutoutComplex</shaderType>
Expand Down Expand Up @@ -84,7 +84,7 @@
</recipeUsers>
</recipeMaker>
<graphicData>
<texPath>avali/Things/Apparel/HUD/HUD_south</texPath>
<texPath>RimValiFFA/Things/Apparel/HUD/HUD_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<uiIconScale>1.25</uiIconScale>
Expand Down Expand Up @@ -115,7 +115,7 @@
<bodyPartGroups>
<li>FullHead</li>
</bodyPartGroups>
<wornGraphicPath>avali/Things/Apparel/HUD/hud</wornGraphicPath>
<wornGraphicPath>avali/Things/Apparel/HUD/HUD</wornGraphicPath>
<layers>
<li>Overhead</li>
</layers>
Expand Down Expand Up @@ -175,7 +175,7 @@
<li>Apparel</li>
</thingCategories>
<graphicData>
<texPath>avali/Things/Apparel/AvaliHeaddress/Headdress_south</texPath>
<texPath>RimValiFFA/Things/Apparel/AvaliHeaddress/Headdress_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<uiIconScale>1.25</uiIconScale>
Expand Down Expand Up @@ -203,7 +203,7 @@
<bodyPartGroups>
<li>FullHead</li>
</bodyPartGroups>
<wornGraphicPath>avali/Things/Apparel/AvaliHeaddress/Headress</wornGraphicPath>
<wornGraphicPath>avali/Things/Apparel/AvaliHeaddress/Headdress</wornGraphicPath>
<layers>
<li>Overhead</li>
</layers>
Expand Down Expand Up @@ -247,7 +247,7 @@
<li>Apparel</li>
</thingCategories>
<graphicData>
<texPath>avali/Things/Apparel/AvaliHood/Hood_south</texPath>
<texPath>RimValiFFA/Things/Apparel/AvaliHood/Hood_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<uiIconScale>1.25</uiIconScale>
Expand Down Expand Up @@ -318,7 +318,7 @@
<li>Apparel</li>
</thingCategories>
<graphicData>
<texPath>avali/Things/Apparel/BellCloak/Cloak_Avali_south</texPath>
<texPath>RimValiFFA/Things/Apparel/BellCloak/Cloak_Avali_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<uiIconScale>1.25</uiIconScale>
Expand Down Expand Up @@ -394,7 +394,7 @@
<li>Apparel</li>
</thingCategories>
<graphicData>
<texPath>avali/Things/Apparel/ThermalWraps/ThermalWraps_Avali_south</texPath>
<texPath>RimValiFFA/Things/Apparel/ThermalWraps/ThermalWraps_Avali_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<uiIconScale>1.25</uiIconScale>
Expand Down
14 changes: 7 additions & 7 deletions 1.3/Defs/Apparel/Armor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</recipeUsers>
</recipeMaker>
<graphicData>
<texPath>avali/Things/Apparel/SpecOpsArmor/SpecOpsArmor_Avali_south</texPath>
<texPath>RimValiFFA/Things/Apparel/SpecOpsArmor/SpecOpsArmor_Avali_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<uiIconScale>1.25</uiIconScale>
Expand Down Expand Up @@ -122,7 +122,7 @@
</recipeUsers>
</recipeMaker>
<graphicData>
<texPath>avali/Things/Apparel/SpecOpsHelmet/SpecOpsHelmet_south</texPath>
<texPath>RimValiFFA/Things/Apparel/SpecOpsHelmet/SpecOpsHelmet_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<uiIconScale>1.25</uiIconScale>
Expand Down Expand Up @@ -219,7 +219,7 @@
</recipeUsers>
</recipeMaker>
<graphicData>
<texPath>avali/Things/Apparel/ScoutHelmet/ScoutHelmet_south</texPath>
<texPath>RimValiFFA/Things/Apparel/ScoutHelmet/ScoutHelmet_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<uiIconScale>1.25</uiIconScale>
Expand Down Expand Up @@ -314,7 +314,7 @@
</recipeUsers>
</recipeMaker>
<graphicData>
<texPath>avali/Things/Apparel/CombatHelmet/CombatHelmet_south</texPath>
<texPath>RimValiFFA/Things/Apparel/CombatHelmet/CombatHelmet_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<uiIconScale>1.25</uiIconScale>
Expand Down Expand Up @@ -406,7 +406,7 @@
</recipeUsers>
</recipeMaker>
<graphicData>
<texPath>avali/Things/Apparel/CombatArmor/CombatArmor_Avali_south</texPath>
<texPath>RimValiFFA/Things/Apparel/CombatArmor/CombatArmor_Avali_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<uiIconScale>1.25</uiIconScale>
Expand Down Expand Up @@ -504,7 +504,7 @@
</recipeUsers>
</recipeMaker>
<graphicData>
<texPath>avali/Things/Apparel/ScoutArmor/ScoutArmor_Avali_south</texPath>
<texPath>RimValiFFA/Things/Apparel/ScoutArmor/ScoutArmor_Avali_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<uiIconScale>1.25</uiIconScale>
Expand Down Expand Up @@ -594,7 +594,7 @@
</skillRequirements>
</recipeMaker>
<graphicData>
<texPath>avali/Things/Apparel/NezaiArmor/NezaiArmor_Avali_south</texPath>
<texPath>RimValiFFA/Things/Apparel/NezaiArmor/NezaiArmor_Avali_south</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<tradeTags>
Expand Down
2 changes: 1 addition & 1 deletion 1.3/Defs/BackstoryDefs/BaseStories.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<defName>AvaliRuffian</defName>
<title>Ruffian</title>
<shortTitle>Ruffian</shortTitle>
<storyDesc>[PAWN_NameDef] had always felt as if not all rules applied to them. Most of [PAWN_possessive] free time was spent along a thin line between legal and illegal be it through grifting valuable assets from notable personalities or having a small edge ahead of everyone else at the gambling table. It didn't take long for their acquired skills to evolve into a lifestyle and that lifestyle into a very real issue with the law. Eventually, [PAWN_pronoun] was forced to flee from their past actions and has found themselves on this planet. Their wild personality makes it very difficult for them to focus on a project for an extended period of time however.</storyDesc>
<storyDesc>[PAWN_nameDef] had always felt as if not all rules applied to them. Most of [PAWN_possessive] free time was spent along a thin line between legal and illegal be it through grifting valuable assets from notable personalities or having a small edge ahead of everyone else at the gambling table. It didn't take long for their acquired skills to evolve into a lifestyle and that lifestyle into a very real issue with the law. Eventually, [PAWN_pronoun] was forced to flee from their past actions and has found themselves on this planet. Their wild personality makes it very difficult for them to focus on a project for an extended period of time however.</storyDesc>
<spawnInCategories>
<li>RimValiBackstories</li>
</spawnInCategories>
Expand Down
8 changes: 4 additions & 4 deletions 1.3/Defs/BuildingDefs/AvaliBeds.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<passability>PassThroughOnly</passability>
<canOverlapZones>false</canOverlapZones>
<graphicData>
<texPath>avali/Beds/AvaliBed</texPath>
<texPath>RimValiFFA/Beds/AvaliBed</texPath>
<graphicClass>Graphic_Single</graphicClass>
<drawSize>1.2</drawSize>
</graphicData>
Expand Down Expand Up @@ -74,7 +74,7 @@
<passability>PassThroughOnly</passability>
<canOverlapZones>false</canOverlapZones>
<graphicData>
<texPath>avali/Beds/AvaliPillowsSmall</texPath>
<texPath>RimValiFFA/Beds/AvaliPillowsSmall</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<drawSize>2</drawSize>
</graphicData>
Expand Down Expand Up @@ -137,7 +137,7 @@
<passability>PassThroughOnly</passability>
<canOverlapZones>false</canOverlapZones>
<graphicData>
<texPath>avali/Beds/AvaliPillowsMedium</texPath>
<texPath>RimValiFFA/Beds/AvaliPillowsMedium</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<drawSize>2</drawSize>
</graphicData>
Expand Down Expand Up @@ -200,7 +200,7 @@
<passability>PassThroughOnly</passability>
<canOverlapZones>false</canOverlapZones>
<graphicData>
<texPath>avali/Beds/AvaliPillowsLarge</texPath>
<texPath>RimValiFFA/Beds/AvaliPillowsLarge</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<drawSize>3</drawSize>
</graphicData>
Expand Down
5 changes: 3 additions & 2 deletions 1.3/Defs/BuildingDefs/Furniture/Beds.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<label>Avali hammock</label>
<description>A cozy hammock suspended between two poles specially designed for resting and Avali in mind.</description>
<graphicData>
<texPath>avali/Buildings/Furniture/hammock_bed</texPath>

<texPath>RimValiFFA/Buildings/Furniture/hammock_bed</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>CutoutComplex</shaderType>
<drawSize>(1,2)</drawSize>
Expand Down Expand Up @@ -54,7 +55,7 @@
<label>Avali bed</label>
<description>A cozy mattress and sheets on a frame for resting. Inspired by its Terran counterparts, this model has been redesigned to better suit an Avali's smaller stature.</description>
<graphicData>
<texPath>avali/Buildings/Furniture/casket_bed</texPath>
<texPath>RimValiFFA/Buildings/Furniture/casket_bed</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>CutoutComplex</shaderType>
<drawSize>(1,2)</drawSize>
Expand Down
4 changes: 2 additions & 2 deletions 1.3/Defs/BuildingDefs/Furniture/EndTable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<description>A small bedside table that makes nearby beds a little more comfortable. This one has been designed in a more Avalonian style, sporting an angular look as well as small crystals on the top that light up when receiving power.</description>
<surfaceType>Item</surfaceType>
<graphicData>
<texPath>avali/Buildings/Furniture/TableLight/Unlit/EndTable</texPath>
<texPath>RimValiFFA/Buildings/Furniture/TableLight/Unlit/EndTable</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<shadowData>
<volume>(0.3, 0.6, 0.3)</volume>
Expand Down Expand Up @@ -38,7 +38,7 @@
<mustBePlacedAdjacentCardinalToBedHead>true</mustBePlacedAdjacentCardinalToBedHead>
</li>
<li Class="RimValiCore.DrawCompProps">
<texPath>avali/Buildings/Furniture/TableLight/Lit/EndTableLit</texPath>
<texPath>RimValiFFA/Buildings/Furniture/TableLight/Lit/EndTableLit</texPath>
<offset>(0,0,0)</offset>
</li>
<li Class="CompProperties_Power">
Expand Down
4 changes: 2 additions & 2 deletions 1.3/Defs/BuildingDefs/Furniture/Tables.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<defName>Illuminate2x2Table</defName>
<label>2x2 Avali table</label>
<graphicData>
<texPath>avali/Buildings/Furniture/SmallTable/SmallTable</texPath>
<texPath>RimValiFFA/Buildings/Furniture/SmallTable/SmallTable</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<drawSize>(2,2)</drawSize>
<damageData>
Expand Down Expand Up @@ -33,7 +33,7 @@
<defName>Illuminate2x4Table</defName>
<label>2x4 Avali table</label>
<graphicData>
<texPath>avali/Buildings/Furniture/Table/Table</texPath>
<texPath>RimValiFFA/Buildings/Furniture/Table/Table</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<drawSize>(2,4)</drawSize>
<damageData>
Expand Down
8 changes: 4 additions & 4 deletions 1.3/Defs/BuildingDefs/ProductionTableDefs/Tables.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<li>ResearchNanoForge</li>
</researchPrerequisites>
<graphicData>
<texPath>avali/Buildings/Production/NanoForge</texPath>
<texPath>RimValiFFA/Buildings/Production/NanoForge</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<shaderType>CutoutComplex</shaderType>
<drawSize>(3,2)</drawSize>
Expand Down Expand Up @@ -113,7 +113,7 @@
<ComponentIndustrial>10</ComponentIndustrial>
</costList>
<graphicData>
<texPath>avali/Buildings/Production/AvaliResearchTable</texPath>
<texPath>RimValiFFA/Buildings/Production/AvaliResearchTable</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<shaderType>CutoutComplex</shaderType>
<drawSize>(4,5)</drawSize>
Expand Down Expand Up @@ -172,7 +172,7 @@
<label>Illuminate Nexus Connection</label>
<description>This device can be used to access higher levels of tech, thanks to its connection to the nexus.</description>
<graphicData>
<texPath>avali/Buildings/Production/SyncCrystal</texPath>
<texPath>RimValiFFA/Buildings/Production/SyncCrystal</texPath>
<graphicClass>Graphic_Single</graphicClass>
<drawSize>3</drawSize>
</graphicData>
Expand Down Expand Up @@ -263,7 +263,7 @@
<li>ResearchNanoLoom</li>
</researchPrerequisites>
<graphicData>
<texPath>avali/Buildings/Production/Loom/Loom</texPath>
<texPath>RimValiFFA/Buildings/Production/Loom/Loom</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<shaderType>CutoutComplex</shaderType>
<drawSize>(2,1.8)</drawSize>
Expand Down
2 changes: 1 addition & 1 deletion 1.3/Defs/BuildingDefs/StructureDefs/Walls.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<thingClass>Building</thingClass>
<category>Building</category>
<graphicData>
<texPath>avali/Buildings/Walls/TentWall_Atlas</texPath>
<texPath>RimValiFFA/Buildings/Walls/TentWall_Atlas</texPath>
<graphicClass>Graphic_Single</graphicClass>
<linkType>CornerFiller</linkType>
<linkFlags>
Expand Down
6 changes: 3 additions & 3 deletions 1.3/Defs/BuildingDefs/Turrets/AERIAL/Aerial.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<designationCategory>RimVali_AvaliSecurity</designationCategory>
<thingClass>AvaliMod.AERIALSYSTEM</thingClass>
<graphicData>
<texPath>avali/Buildings/Turrets/AERIAL/AERIAL_TURRET_BASE_3X3</texPath>
<texPath>RimValiFFA/Buildings/Turrets/AERIAL/AERIAL_TURRET_BASE_3X3</texPath>
<drawSize>(3,3)</drawSize>
</graphicData>
<defName>Aerial</defName>
Expand Down Expand Up @@ -35,7 +35,7 @@
<li>Artillery_MannedMortar</li>
</buildingTags>
</building>
<uiIconPath>avali/Buildings/Turrets/AERIAL/AERIAL_GUI_IMAGE</uiIconPath>
<uiIconPath>RimValiFFA/Buildings/Turrets/AERIAL/AERIAL_GUI_IMAGE</uiIconPath>
<uiIconScale>0.9</uiIconScale>
</ThingDef>

Expand Down Expand Up @@ -72,7 +72,7 @@
<label>AERIAL</label>
<description>AERIAL launch system.</description>
<graphicData>
<texPath>avali/Buildings/Turrets/AERIAL/AERIAL_TURRET</texPath>
<texPath>RimValiFFA/Buildings/Turrets/AERIAL/AERIAL_TURRET</texPath>
<drawSize>(3,3)</drawSize>
</graphicData>
<weaponTags>
Expand Down
4 changes: 2 additions & 2 deletions 1.3/Defs/BuildingDefs/Turrets/AERIAL/Shells/ATOM.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<label>AERIAL ATOM rocket</label>
<description>A highly explosive and devastating rocket, launched from AERIAL.</description>
<graphicData>
<texPath>avali/Buildings/Turrets/AERIAL/Shells/AERIAL_ATOM</texPath>
<texPath>RimValiFFA/Buildings/Turrets/AERIAL/Shells/AERIAL_ATOM</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<comps>
Expand Down Expand Up @@ -72,7 +72,7 @@
<defName>AERIAL_ATOM_SHELL</defName>
<label>ATOM shell</label>
<graphicData>
<texPath>avali/Buildings/Turrets/AERIAL/Shells/AERIAL_ATOM_LAUNCHED</texPath>
<texPath>RimValiFFA/Buildings/Turrets/AERIAL/Shells/AERIAL_ATOM_LAUNCHED</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
</graphicData>
Expand Down
4 changes: 2 additions & 2 deletions 1.3/Defs/BuildingDefs/Turrets/AERIAL/Shells/EMP.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<label>AERIAL EMP rocket</label>
<description>A rocket with an onboard EMP device, made to be launched from the AERIAL system.</description>
<graphicData>
<texPath>avali/Buildings/Turrets/AERIAL/Shells/AERIAL_EMP</texPath>
<texPath>RimValiFFA/Buildings/Turrets/AERIAL/Shells/AERIAL_EMP</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<comps>
Expand Down Expand Up @@ -34,7 +34,7 @@
<defName>AERIAL_EMP_SHELL</defName>
<label>EMP shell</label>
<graphicData>
<texPath>avali/Buildings/Turrets/AERIAL/Shells/AERIAL_EMP_LAUNCHED</texPath>
<texPath>RimValiFFA/Buildings/Turrets/AERIAL/Shells/AERIAL_EMP_LAUNCHED</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
</graphicData>
Expand Down
4 changes: 2 additions & 2 deletions 1.3/Defs/BuildingDefs/Turrets/AERIAL/Shells/HE.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<label>AERIAL HE rocket</label>
<description>A highly explosive rocket, launched from an AERIAL system.</description>
<graphicData>
<texPath>avali/Buildings/Turrets/AERIAL/Shells/AERIAL_HE</texPath>
<texPath>RimValiFFA/Buildings/Turrets/AERIAL/Shells/AERIAL_HE</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<comps>
Expand Down Expand Up @@ -34,7 +34,7 @@
<defName>AERIAL_HE_SHELL</defName>
<label>high-explosive shell</label>
<graphicData>
<texPath>avali/Buildings/Turrets/AERIAL/Shells/AERIAL_HE_LAUNCHED</texPath>
<texPath>RimValiFFA/Buildings/Turrets/AERIAL/Shells/AERIAL_HE_LAUNCHED</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
</graphicData>
Expand Down
12 changes: 9 additions & 3 deletions 1.3/Defs/BuildingDefs/Turrets/AIMS/AIMS.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
<designationCategory>RimVali_AvaliSecurity</designationCategory>
<drawerType>MapMeshAndRealTime</drawerType>
<graphicData>
<texPath>avali/Buildings/Turrets/AIMS/mortar_base</texPath>






<texPath>RimValiFFA/Buildings/Turrets/AIMS/mortar_base</texPath>
<drawSize>(2,2)</drawSize>
</graphicData>
<defName>AvaliAIMS</defName>
Expand Down Expand Up @@ -37,7 +43,7 @@
<turretBurstWarmupTime>7.0</turretBurstWarmupTime>
<turretBurstCooldownTime>30.0</turretBurstCooldownTime>
</building>
<uiIconPath>avali/Buildings/Turrets/AIMS/AIMS_GUI_IMAGE</uiIconPath>
<uiIconPath>RimValiFFA/Buildings/Turrets/AIMS/AIMS_GUI_IMAGE</uiIconPath>
<uiIconScale>0.9</uiIconScale>
</ThingDef>

Expand All @@ -46,7 +52,7 @@
<label>AIMS</label>
<description>AIMS launch system.</description>
<graphicData>
<texPath>avali/Buildings/Turrets/AIMS/AIMS</texPath>
<texPath>RimValiFFA/Buildings/Turrets/AIMS/AIMS</texPath>
</graphicData>
<weaponTags>
<li>Artillery_BaseDestroyer</li>
Expand Down
Loading

0 comments on commit abe3de7

Please sign in to comment.