Skip to content

Commit

Permalink
Merge pull request #54 from A2Bcorp/development
Browse files Browse the repository at this point in the history 
Alpha 13 Update
  • Loading branch information
@ForsakenShell
ForsakenShell committed Apr 20, 2016
2 parents e4e6b4f + 9bc8781 commit 47c69cc
Show file tree
Hide file tree
Showing 33 changed files with 1,392 additions and 508 deletions.
6 changes: 3 additions & 3 deletions About/About.xml
View file
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ModMetaData>
<name>A2B_Core v0.12.1</name>
<name>A2B_Core v0.13.0</name>
<author>noone, asarium, FredrikLH, TehJoE, bigmap001, 1000101</author>
<targetVersion>Alpha 12d</targetVersion>
<targetVersion>Alpha 13</targetVersion>
<url>http://bit.ly/1EdE0Xc</url>
<description>This mod adds conveyor belts to Rimworld. Now you can efficiently transport goods to the most remote locations of your encampment.</description>
<description>This mod adds conveyor belts to Rimworld. Now you can efficiently transport goods to the most remote locations of your encampment.</description>
</ModMetaData>
Binary file modified Assemblies/A2B.dll
View file
Binary file not shown.
98 changes: 51 additions & 47 deletions Defs/A2BDataDefs/A2BData.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<!--
<!--
This was changed from being hard-coded in pre v0.11.0.0 to
being defined in defs to allow modders to more easily integrate
A2B into modpiles and users to tweak settings to their own
Expand All @@ -12,51 +12,55 @@
Research - All listed research must be complete
-->
<A2BDataDef>

<!-- DO NOT CHANGE "defName" -->
<defName>A2BCore</defName>

<!-- Core version -->
<Version>0.12.1</Version>

<!-- Occasional - Ticks between occasional callbacks -->
<OccasionalTicks>100</OccasionalTicks>

<!-- Belt Speed - Ticks to cross cell -->
<BeltSpeedBase>180</BeltSpeedBase>
<BeltSpeedOffset>-90</BeltSpeedOffset>

<BeltSpeedResearch>
<li>A2B_BeltSpeed</li>
</BeltSpeedResearch>

<!-- Climatization - Degrees celcius -->
<ClimatizationMinTemperatureBase>-10.0</ClimatizationMinTemperatureBase>
<ClimatizationMinTemperatureOffset>-20.0</ClimatizationMinTemperatureOffset>

<ClimatizationResearch>
<li>A2B_Climatization</li>
</ClimatizationResearch>

<!-- Durability - % Chance of degradation -->
<DurabilityBase>0.05</DurabilityBase>
<DurabilityOffset>-0.025</DurabilityOffset>

<DurabilityResearch>
<li>A2B_Durability</li>
</DurabilityResearch>

<!-- Reliability - Linear transform to % from component hit points % -->
<ReliabilityFlatRateThresholdBase>5.0</ReliabilityFlatRateThresholdBase>
<ReliabilityFlatRateThresholdOffset>5.0</ReliabilityFlatRateThresholdOffset>
<ReliabilityStartThresholdBase>0.20</ReliabilityStartThresholdBase>
<ReliabilityStartThresholdOffset>0.20</ReliabilityStartThresholdOffset>

<ReliabilityResearch>
<li>A2B_Reliability</li>
</ReliabilityResearch>

</A2BDataDef>
<A2BDataDef>

<!-- DO NOT CHANGE "defName" -->
<defName>A2BCore</defName>

<!-- Core version -->
<Version>0.13.0</Version>

<!-- Occasional - Ticks between occasional callbacks -->
<OccasionalTicks>100</OccasionalTicks>

<!-- Power consumption -->
<LowPowerFactor>0.1</LowPowerFactor>
<PowerPerUndercover>10</PowerPerUndercover>

<!-- Belt Speed - Ticks to cross cell -->
<BeltSpeedBase>180</BeltSpeedBase>
<BeltSpeedOffset>-90</BeltSpeedOffset>

<BeltSpeedResearch>
<li>A2B_BeltSpeed</li>
</BeltSpeedResearch>

<!-- Climatization - Degrees celcius -->
<ClimatizationMinTemperatureBase>-10.0</ClimatizationMinTemperatureBase>
<ClimatizationMinTemperatureOffset>-20.0</ClimatizationMinTemperatureOffset>

<ClimatizationResearch>
<li>A2B_Climatization</li>
</ClimatizationResearch>

<!-- Durability - % Chance of degradation -->
<DurabilityBase>0.03</DurabilityBase>
<DurabilityOffset>-0.015</DurabilityOffset>

<DurabilityResearch>
<li>A2B_Durability</li>
</DurabilityResearch>

<!-- Reliability - Linear transform to % from component hit points % -->
<ReliabilityFlatRateThresholdBase>5.0</ReliabilityFlatRateThresholdBase>
<ReliabilityFlatRateThresholdOffset>5.0</ReliabilityFlatRateThresholdOffset>
<ReliabilityStartThresholdBase>0.20</ReliabilityStartThresholdBase>
<ReliabilityStartThresholdOffset>0.20</ReliabilityStartThresholdOffset>

<ReliabilityResearch>
<li>A2B_Reliability</li>
</ReliabilityResearch>

</A2BDataDef>

</Defs>
2 changes: 1 addition & 1 deletion Defs/DesignationDefs/A2B_Designations.xml
View file
Expand Up @@ -5,7 +5,7 @@
<defName>A2BUndercoverCoverToggleDesignation</defName>
<texturePath>Designations/Flick</texturePath>
<targetType>Thing</targetType>
<removeIfBuildingDestroyed>true</removeIfBuildingDestroyed>
<removeIfBuildingDespawned>true</removeIfBuildingDespawned>
</DesignationDef>

</DesignationDefs>
10 changes: 0 additions & 10 deletions Defs/DesignatorDefs/A2B_Designators.xml
View file

This file was deleted.

80 changes: 50 additions & 30 deletions Defs/ThingDefs/Building_A2B.xml
View file
Expand Up @@ -26,13 +26,27 @@
<fillPercent>1</fillPercent>
<staticSunShadowHeight>0.34</staticSunShadowHeight>

<comps>
<li Class="CompProperties_Flickable" />
<li Class="CompProperties_Breakdownable" />
</comps>

<tickerType>Normal</tickerType>

<designationCategory>ConveyorBelts</designationCategory>
<researchPrerequisite>A2B</researchPrerequisite>
</ThingDef>

<ThingDef ParentName="BuildingBase">
<ThingDef Name="A2BBase" ParentName="BuildingBase" Abstract="True">
<researchPrerequisites>
<li>A2B</li>
</researchPrerequisites>
</ThingDef>

<ThingDef Name="A2BMinified" ParentName="A2BBase" Abstract="True">
<minifiedDef>MinifiedFurniture</minifiedDef>
</ThingDef>

<ThingDef ParentName="A2BMinified">
<defName>A2BBelt</defName>
<label>conveyor belt</label>
<thingClass>A2B.Building_ConveyorBelt</thingClass>
Expand All @@ -48,15 +62,15 @@
</statBases>
<description>The basic unit of a conveyor belt.</description>
<comps>
<li>
<li Class="CompProperties_Power">
<compClass>CompPowerTrader</compClass>
<basePowerConsumption>10</basePowerConsumption>
<soundPowerOn>PowerOnSmall</soundPowerOn>
<soundPowerOff>PowerOffSmall</soundPowerOff>
<transmitsPower>true</transmitsPower>
<startElectricalFires>true</startElectricalFires>
</li>
<li>
<li Class="CompProperties_Glower">
<compClass>CompGlower</compClass>
<glowRadius>1</glowRadius>
<glowColor>(255,200,0,0)</glowColor>
Expand All @@ -67,13 +81,14 @@
</comps>
<size>(1,1)</size>
<costList>
<Steel>15</Steel>
<Steel>10</Steel>
<Components>1</Components>
</costList>
<designationHotkey>B</designationHotkey>
<placingDraggableDimensions>1</placingDraggableDimensions>
<placingDraggableDimensions>1</placingDraggableDimensions>
</ThingDef>

<ThingDef ParentName="BuildingBase">
<ThingDef ParentName="A2BMinified">
<defName>A2BCurve</defName>
<label>curved belt</label>
<thingClass>Building</thingClass>
Expand All @@ -89,15 +104,15 @@
</statBases>
<description>The basic unit of a conveyor belt, only curved.</description>
<comps>
<li>
<li Class="CompProperties_Power">
<compClass>CompPowerTrader</compClass>
<basePowerConsumption>10</basePowerConsumption>
<soundPowerOn>PowerOnSmall</soundPowerOn>
<soundPowerOff>PowerOffSmall</soundPowerOff>
<transmitsPower>true</transmitsPower>
<startElectricalFires>true</startElectricalFires>
</li>
<li>
<li Class="CompProperties_Glower">
<compClass>CompGlower</compClass>
<glowRadius>1</glowRadius>
<glowColor>(255,200,0,0)</glowColor>
Expand All @@ -108,12 +123,13 @@
</comps>
<size>(1,1)</size>
<costList>
<Steel>15</Steel>
<Steel>10</Steel>
<Components>1</Components>
</costList>
<designationHotkey>V</designationHotkey>
<designationHotkey>V</designationHotkey>
</ThingDef>

<ThingDef ParentName="BuildingBase">
<ThingDef ParentName="A2BMinified">
<defName>A2BLoader</defName>
<label>loader</label>
<thingClass>Building_Storage</thingClass>
Expand Down Expand Up @@ -150,15 +166,15 @@
</statBases>
<description>Loads any item you want onto a belt.</description>
<comps>
<li>
<li Class="CompProperties_Power">
<compClass>CompPowerTrader</compClass>
<basePowerConsumption>10</basePowerConsumption>
<soundPowerOn>PowerOnSmall</soundPowerOn>
<soundPowerOff>PowerOffSmall</soundPowerOff>
<transmitsPower>true</transmitsPower>
<startElectricalFires>true</startElectricalFires>
</li>
<li>
<li Class="CompProperties_Glower">
<compClass>CompGlower</compClass>
<glowRadius>1</glowRadius>
<glowColor>(255,200,0,0)</glowColor>
Expand All @@ -168,14 +184,15 @@
</li>
</comps>
<costList>
<Steel>15</Steel>
<Steel>10</Steel>
<Components>1</Components>
</costList>
<neverMultiSelect>true</neverMultiSelect>
<designationHotkey>L</designationHotkey>
<surfaceType>Item</surfaceType>
<surfaceType>Item</surfaceType>
</ThingDef>

<ThingDef ParentName="BuildingBase">
<ThingDef ParentName="A2BMinified">
<defName>A2BUnloader</defName>
<label>unloader</label>
<thingClass>Building</thingClass>
Expand All @@ -191,15 +208,15 @@
</statBases>
<description>Unload the content of a conveyor belt into a pile or onto a hopper.</description>
<comps>
<li>
<li Class="CompProperties_Power">
<compClass>CompPowerTrader</compClass>
<basePowerConsumption>10</basePowerConsumption>
<soundPowerOn>PowerOnSmall</soundPowerOn>
<soundPowerOff>PowerOffSmall</soundPowerOff>
<transmitsPower>true</transmitsPower>
<startElectricalFires>true</startElectricalFires>
</li>
<li>
<li Class="CompProperties_Glower">
<compClass>CompGlower</compClass>
<glowRadius>1</glowRadius>
<glowColor>(255,200,0,0)</glowColor>
Expand All @@ -210,12 +227,13 @@
</comps>
<size>(1,1)</size>
<costList>
<Steel>15</Steel>
<Steel>10</Steel>
<Components>1</Components>
</costList>
<designationHotkey>U</designationHotkey>
<designationHotkey>U</designationHotkey>
</ThingDef>

<ThingDef ParentName="BuildingBase">
<ThingDef ParentName="A2BMinified">
<defName>A2BSplitter</defName>
<label>splitter</label>
<thingClass>Building</thingClass>
Expand All @@ -231,15 +249,15 @@
</statBases>
<description>Sends items left, forward, and right in sequence.</description>
<comps>
<li>
<li Class="CompProperties_Power">
<compClass>CompPowerTrader</compClass>
<basePowerConsumption>15</basePowerConsumption>
<soundPowerOn>PowerOnSmall</soundPowerOn>
<soundPowerOff>PowerOffSmall</soundPowerOff>
<transmitsPower>true</transmitsPower>
<startElectricalFires>true</startElectricalFires>
</li>
<li>
<li Class="CompProperties_Glower">
<compClass>CompGlower</compClass>
<glowRadius>1</glowRadius>
<glowColor>(255,200,0,0)</glowColor>
Expand All @@ -250,12 +268,13 @@
</comps>
<size>(1,1)</size>
<costList>
<Steel>20</Steel>
<Steel>10</Steel>
<Components>2</Components>
</costList>
<designationHotkey>P</designationHotkey>
<designationHotkey>P</designationHotkey>
</ThingDef>

<ThingDef ParentName="BuildingBase">
<ThingDef ParentName="A2BMinified">
<defName>A2BMerger</defName>
<label>merger</label>
<thingClass>Building</thingClass>
Expand All @@ -271,15 +290,15 @@
</statBases>
<description>Merges up to three belts into one.</description>
<comps>
<li>
<li Class="CompProperties_Power">
<compClass>CompPowerTrader</compClass>
<basePowerConsumption>15</basePowerConsumption>
<soundPowerOn>PowerOnSmall</soundPowerOn>
<soundPowerOff>PowerOffSmall</soundPowerOff>
<transmitsPower>true</transmitsPower>
<startElectricalFires>true</startElectricalFires>
</li>
<li>
<li Class="CompProperties_Glower">
<compClass>CompGlower</compClass>
<glowRadius>1</glowRadius>
<glowColor>(255,200,0,0)</glowColor>
Expand All @@ -290,7 +309,8 @@
</comps>
<size>(1,1)</size>
<costList>
<Steel>20</Steel>
<Steel>10</Steel>
<Components>1</Components>
</costList>
<designationHotkey>M</designationHotkey>
</ThingDef>
Expand Down

0 comments on commit 47c69cc

Please sign in to comment.