Skip to content

Commit 66cdf8a

Browse files
juanosargjuanosarg
committed
v5.108
1 parent c03b79b commit 66cdf8a

File tree

10 files changed

+195
-19
lines changed

10 files changed

+195
-19
lines changed

‎1.6/Defs/Drugs/AB_RawRimeNodules.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<comps>
3535
<li Class="CompProperties_Drug">
36-
<listOrder>1000</listOrder>
36+
<listOrder>31</listOrder>
3737
<overdoseSeverityOffset>0.08~0.14</overdoseSeverityOffset>
3838
</li>
3939
</comps>

‎1.6/Defs/NetDefs/PropaneNet.xml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -475,25 +475,21 @@
475475
<costList>
476476
<Steel>150</Steel>
477477
<AB_CrystalWood>50</AB_CrystalWood>
478-
<ComponentIndustrial>3</ComponentIndustrial>
478+
<ComponentIndustrial>1</ComponentIndustrial>
479479
</costList>
480480
<uiIconScale>0.75</uiIconScale>
481481
<comps>
482482
<li Class="CompProperties_Power">
483483
<compClass>CompPowerTrader</compClass>
484-
<basePowerConsumption>150</basePowerConsumption>
484+
<basePowerConsumption>50</basePowerConsumption>
485485
<shortCircuitInRain>false</shortCircuitInRain>
486486
</li>
487-
<li Class="PipeSystem.CompProperties_SpawnerOrNet">
488-
<pipeNet>AB_PropaneNet</pipeNet>
489-
<inheritFaction>true</inheritFaction>
490-
<requiresPower>true</requiresPower>
491-
<spawnCount>25</spawnCount>
492-
<spawnIntervalRange>200000~300000</spawnIntervalRange>
493-
<thingToSpawn>AB_Propane</thingToSpawn>
494-
<writeTimeLeftToSpawn>true</writeTimeLeftToSpawn>
495-
496-
</li>
487+
488+
<li Class="PipeSystem.CompProperties_ResourceTrader">
489+
<pipeNet>AB_PropaneNet</pipeNet>
490+
<consumptionPerTick>-0.4</consumptionPerTick>
491+
</li>
492+
497493
<li Class="CompProperties_Breakdownable"/>
498494
</comps>
499495
<rotatable>true</rotatable>

‎1.6/Defs/RecipeDefs/Recipes_Refinery_Propane.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Defs>
3+
4+
5+
<RecipeDef>
6+
<defName>AB_PropaneToChemfuel</defName>
7+
<label>extract chemfuel from propane</label>
8+
<description>Make a batch of chemfuel by extracting it from propane.</description>
9+
<jobString>Refining chemfuel from propane.</jobString>
10+
<effectWorking>Cremate</effectWorking>
11+
<soundWorking>Recipe_Cremate</soundWorking>
12+
<workAmount>1000</workAmount>
13+
<recipeUsers>
14+
<li>BiofuelRefinery</li>
15+
</recipeUsers>
16+
<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
17+
18+
<ingredients>
19+
<li>
20+
<filter>
21+
<thingDefs>
22+
<li>AB_Propane</li>
23+
</thingDefs>
24+
</filter>
25+
<count>50</count>
26+
</li>
27+
</ingredients>
28+
<fixedIngredientFilter>
29+
<thingDefs>
30+
<li>AB_Propane</li>
31+
</thingDefs>
32+
</fixedIngredientFilter>
33+
34+
<products>
35+
<Chemfuel>50</Chemfuel>
36+
</products>
37+
</RecipeDef>
38+
39+
40+
41+
42+
</Defs>

‎1.6/Defs/ThingDefs_Buildings/Buildings_PropaneLakes.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</inspectorTabs>
4444
<comps>
4545
<li Class="CompProperties_Refuelable">
46-
<fuelConsumptionRate>80.0</fuelConsumptionRate>
46+
<fuelConsumptionRate>250.0</fuelConsumptionRate>
4747
<fuelCapacity>50.0</fuelCapacity>
4848
<fuelFilter>
4949
<thingDefs>
@@ -131,7 +131,7 @@
131131
</building>
132132
<comps>
133133
<li Class="CompProperties_Refuelable">
134-
<fuelConsumptionRate>80.0</fuelConsumptionRate>
134+
<fuelConsumptionRate>500.0</fuelConsumptionRate>
135135
<fuelCapacity>50.0</fuelCapacity>
136136
<fuelFilter>
137137
<thingDefs>
@@ -209,7 +209,7 @@
209209
</inspectorTabs>
210210
<comps>
211211
<li Class="CompProperties_Refuelable">
212-
<fuelConsumptionRate>300.0</fuelConsumptionRate>
212+
<fuelConsumptionRate>1000.0</fuelConsumptionRate>
213213
<fuelCapacity>50.0</fuelCapacity>
214214
<fuelFilter>
215215
<thingDefs>
@@ -338,7 +338,7 @@
338338
<defName>AB_PropaneHeater</defName>
339339
<label>propane heater</label>
340340
<description>A device that burns propane fuel and turns it into heat. The propane heater wastes a lot of fuel when attempting to reach temperatures too different from ambient ones, but it's quite fuel conservative if configured carefully.</description>
341-
<thingClass>AlphaBiomes.Building_PropaneHeater</thingClass>
341+
<thingClass>PipeSystem.Building_ResourceHeater</thingClass>
342342
<graphicData>
343343
<texPath>Things/Building/PropaneLakes/AB_PropaneHeater</texPath>
344344
<graphicClass>Graphic_Single</graphicClass>
@@ -370,7 +370,7 @@
370370
<Mass>6</Mass>
371371
<Flammability>0.5</Flammability>
372372
</statBases>
373-
<tickerType>Normal</tickerType>
373+
<tickerType>Rare</tickerType>
374374
<costList>
375375
<Steel>50</Steel>
376376
<AB_CrystalWood>20</AB_CrystalWood>

‎1.6/Defs/ThingDefs_Items/Items_Resource_Stuff.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@
338338
</ThingDef>
339339
<ThingDef ParentName="ResourceBase">
340340
<defName>AB_Propane</defName>
341-
<label>propane fuel tank</label>
341+
<label>propane</label>
342342
<description>A versatile fuel. Can be converted into chemfuel, or used as fuel for propane specific buildings, such as heaters or stoves. Insert inane and trite King of the Hill joke here (yes, I have heard them all, you are not original).</description>
343343
<tickerType>Normal</tickerType>
344344
<graphicData>

‎1.6/Defs/ThingDefs_Misc/Various_Stone.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,13 @@
117117
<MeleeWeapon_CooldownMultiplier>1.35</MeleeWeapon_CooldownMultiplier>
118118
</statFactors>
119119
</stuffProps>
120+
<modExtensions>
121+
<li Class="VEF.Things.StuffExtension">
122+
<structureGenerationCommonalityFactor>0</structureGenerationCommonalityFactor>
123+
<weaponGenerationCommonalityFactor>0</weaponGenerationCommonalityFactor>
124+
<apparelGenerationCommonalityFactor>0</apparelGenerationCommonalityFactor>
125+
</li>
126+
</modExtensions>
120127
</ThingDef>
121128
<!-- ================ Rose Quartz ================ -->
122129
<ThingDef ParentName="GU_RockBase" Name="GU_QuartzBase">

‎1.6/Defs/WorkGiverDefs/WorkGivers.xml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,52 @@
2828
<li>Manipulation</li>
2929
</requiredCapacities>
3030
</WorkGiverDef>
31+
<WorkGiverDef>
32+
<defName>AB_DoBillsMakeWeapons</defName>
33+
<label>make weapons</label>
34+
<giverClass>WorkGiver_DoBill</giverClass>
35+
<workType>Smithing</workType>
36+
<priorityInType>115</priorityInType>
37+
<fixedBillGiverDefs>
38+
<li>AB_PropaneFueledSmithy</li>
39+
</fixedBillGiverDefs>
40+
<verb>smith at</verb>
41+
<gerund>smithing at</gerund>
42+
<requiredCapacities>
43+
<li>Manipulation</li>
44+
</requiredCapacities>
45+
<prioritizeSustains>true</prioritizeSustains>
46+
</WorkGiverDef>
47+
<WorkGiverDef>
48+
<defName>AB_DoBillsMachiningTable</defName>
49+
<label>make things at machining table</label>
50+
<giverClass>WorkGiver_DoBill</giverClass>
51+
<workType>Smithing</workType>
52+
<priorityInType>75</priorityInType>
53+
<fixedBillGiverDefs>
54+
<li>AB_PropaneTableMachining</li>
55+
</fixedBillGiverDefs>
56+
<verb>work at</verb>
57+
<gerund>working at</gerund>
58+
<requiredCapacities>
59+
<li>Manipulation</li>
60+
</requiredCapacities>
61+
<prioritizeSustains>true</prioritizeSustains>
62+
</WorkGiverDef>
63+
<WorkGiverDef>
64+
<defName>AB_DoBillsSmelter</defName>
65+
<label>smelt items</label>
66+
<giverClass>WorkGiver_DoBill</giverClass>
67+
<workType>Crafting</workType>
68+
<priorityInType>80</priorityInType>
69+
<fixedBillGiverDefs>
70+
<li>AB_PropaneSmelter</li>
71+
</fixedBillGiverDefs>
72+
<verb>refine at</verb>
73+
<gerund>refining at</gerund>
74+
<requiredCapacities>
75+
<li>Manipulation</li>
76+
</requiredCapacities>
77+
<prioritizeSustains>true</prioritizeSustains>
78+
</WorkGiverDef>
3179
</Defs>

‎1.6/Mods/Odyssey/Defs/BiomeStructuresDefs/BiomeStructuresDefs_Odyssey.xml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,85 @@
2424
<structure>AB_MechanoidReceiver</structure>
2525
</li>
2626

27+
28+
<!-- Propane Lakes, mutator locked -->
29+
30+
<li>
31+
<mutator>AB_PropaneLakes</mutator>
32+
<structure>AB_PropanePipe</structure>
33+
</li>
34+
<li>
35+
<mutator>AB_PropaneLakes</mutator>
36+
<structure>AB_PropanePipe_Underground</structure>
37+
</li>
38+
<li>
39+
<mutator>AB_PropaneLakes</mutator>
40+
<structure>AB_Propane_Valve</structure>
41+
</li>
42+
<li>
43+
<mutator>AB_PropaneLakes</mutator>
44+
<structure>AB_PropaneStorage</structure>
45+
</li>
46+
<li>
47+
<mutator>AB_PropaneLakes</mutator>
48+
<structure>AB_PropanePump</structure>
49+
</li>
50+
<li>
51+
<mutator>AB_PropaneLakes</mutator>
52+
<structure>AB_PropaneTap</structure>
53+
</li>
54+
<li>
55+
<mutator>AB_PropaneLakes</mutator>
56+
<structure>AB_PropaneDrain</structure>
57+
</li>
58+
<li>
59+
<mutator>AB_PropaneLakes</mutator>
60+
<structure>AB_PropaneStove</structure>
61+
</li>
62+
<li>
63+
<mutator>AB_PropaneLakes</mutator>
64+
<structure>AB_PropaneHeater</structure>
65+
</li>
66+
<li>
67+
<mutator>AB_PropaneLakes</mutator>
68+
<structure>AB_AlienWoodFloors_CrystalWood</structure>
69+
</li>
70+
<li>
71+
<mutator>AB_PropaneLakes</mutator>
72+
<structure>AB_PropaneFueledSmithy</structure>
73+
</li>
74+
<li>
75+
<mutator>AB_PropaneLakes</mutator>
76+
<structure>AB_PropaneSmelter</structure>
77+
</li>
78+
<li>
79+
<mutator>AB_PropaneLakes</mutator>
80+
<structure>AB_PropaneTableMachining</structure>
81+
</li>
82+
<li>
83+
<mutator>AB_PropaneLakes</mutator>
84+
<structure>AB_Turret_Propane</structure>
85+
</li>
86+
87+
<!-- Tar Pits, mutator locked -->
88+
89+
<li>
90+
<mutator>AB_TarLakes</mutator>
91+
<structure>AB_TarPump</structure>
92+
</li>
93+
<li>
94+
<mutator>AB_TarLakes</mutator>
95+
<structure>AB_TrapIED_Tar</structure>
96+
</li>
97+
<li>
98+
<mutator>AB_TarLakes</mutator>
99+
<structure>AB_AsphaltFloor</structure>
100+
</li>
101+
<li>
102+
<mutator>AB_TarLakes</mutator>
103+
<structure>AB_AsphaltBridge</structure>
104+
</li>
105+
27106
</structureToBiomeList>
28107
</AlphaBiomes.BiomeStructuresDef>
29108
</Defs>

‎1.6/Mods/Odyssey/Defs/MutatorIconDef/MutatorIconDef.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,6 +1019,10 @@
10191019
<mutator>GL_Valley</mutator>
10201020
<icon>UI/Icons/AB_MutatorIcons/AB_MutatorIcon_Valley</icon>
10211021
</li>
1022+
<li MayRequire="m00nl1ght.GeologicalLandforms.BiomeTransitions">
1023+
<mutator>GL_BiomeTransitions</mutator>
1024+
<icon>UI/Icons/AB_MutatorIcons/AB_MutatorIcon_MixedBiomesMod</icon>
1025+
</li>
10221026
</mutatorIcons>
10231027
</AlphaBiomes.MutatorIconDef>
10241028
</Defs>

‎Textures/UI/Icons/AB_MutatorIcons/AB_MutatorIcon_MixedBiomesMod.png‎

14.9 KB
Loading

0 commit comments

Comments
 (0)