Skip to content
This repository has been archived by the owner on Nov 25, 2018. It is now read-only.

Commit

Permalink
B18 Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@notfood
notfood committed Nov 23, 2017
1 parent 1a36718 commit 8542539
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 34 deletions.
2 changes: 1 addition & 1 deletion About/About.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>Infused</name>
<author>Latta &amp; NotFood</author>
<url>https://ludeon.com/forums/index.php?topic=21884.0</url>
<targetVersion>0.17.0</targetVersion>
<targetVersion>0.18.0</targetVersion>
<description>Equipment enchantment
</description>
</ModMetaData>
1 change: 1 addition & 0 deletions About/PublishedFileId.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
731284821
Binary file modified Assemblies/Infused.dll
View file
Binary file not shown.
46 changes: 20 additions & 26 deletions Defs/InfusionDefs/Prefixes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</value>
</li>
<li>
<key>MeleeWeapon_Cooldown</key>
<key>MeleeWeapon_CooldownMultiplier</key>
<value>
<multiplier>0.97</multiplier>
</value>
Expand Down Expand Up @@ -64,7 +64,7 @@
</allowance>
<stats>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<offset>2</offset>
</value>
Expand Down Expand Up @@ -250,7 +250,7 @@
</value>
</li>
<li>
<key>MeleeWeapon_Cooldown</key>
<key>MeleeWeapon_CooldownMultiplier</key>
<value>
<multiplier>0.97</multiplier>
</value>
Expand All @@ -272,7 +272,7 @@
</value>
</li>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<offset>2</offset>
</value>
Expand Down Expand Up @@ -380,13 +380,13 @@
</allowance>
<stats>
<li>
<key>MeleeWeapon_Cooldown</key>
<key>MeleeWeapon_CooldownMultiplier</key>
<value>
<multiplier>0.97</multiplier>
</value>
</li>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<offset>2</offset>
</value>
Expand Down Expand Up @@ -424,7 +424,7 @@
</allowance>
<stats>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<multiplier>1.05</multiplier>
<offset>2</offset>
Expand Down Expand Up @@ -652,7 +652,7 @@
</allowance>
<stats>
<li>
<key>MeleeWeapon_Cooldown</key>
<key>MeleeWeapon_CooldownMultiplier</key>
<value>
<multiplier>0.93</multiplier>
</value>
Expand All @@ -664,7 +664,7 @@
</value>
</li>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<offset>3</offset>
</value>
Expand Down Expand Up @@ -841,7 +841,7 @@
</value>
</li>
<li>
<key>MeleeWeapon_Cooldown</key>
<key>MeleeWeapon_CooldownMultiplier</key>
<value>
<multiplier>0.95</multiplier>
</value>
Expand Down Expand Up @@ -901,16 +901,10 @@
<ranged>false</ranged>
</allowance>
<stats>
<li>
<key>StonecuttingSpeed</key>
<value>
<multiplier>1.07</multiplier>
</value>
</li>
<li>
<key>SculptingSpeed</key>
<value>
<multiplier>1.07</multiplier>
<multiplier>1.14</multiplier>
</value>
</li>
</stats>
Expand Down Expand Up @@ -984,7 +978,7 @@
</allowance>
<stats>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<offset>5</offset>
<multiplier>1.07</multiplier>
Expand Down Expand Up @@ -1175,7 +1169,7 @@
</value>
</li>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<offset>2</offset>
</value>
Expand Down Expand Up @@ -1228,7 +1222,7 @@
<labelShort>swft</labelShort>
<stats>
<li>
<key>MeleeWeapon_Cooldown</key>
<key>MeleeWeapon_CooldownMultiplier</key>
<value>
<multiplier>0.82</multiplier>
</value>
Expand Down Expand Up @@ -1280,7 +1274,7 @@
</value>
</li>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<multiplier>0.5</multiplier>
</value>
Expand Down Expand Up @@ -1377,7 +1371,7 @@
</allowance>
<stats>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<multiplier>1.18</multiplier>
<offset>7</offset>
Expand Down Expand Up @@ -1548,7 +1542,7 @@
</allowance>
<stats>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<multiplier>1.18</multiplier>
<offset>7</offset>
Expand Down Expand Up @@ -1677,7 +1671,7 @@
</value>
</li>
<li>
<key>MeleeWeapon_Cooldown</key>
<key>MeleeWeapon_CooldownMultiplier</key>
<value>
<multiplier>0.82</multiplier>
</value>
Expand Down Expand Up @@ -1853,13 +1847,13 @@
</value>
</li>
<li>
<key>MeleeWeapon_Cooldown</key>
<key>MeleeWeapon_CooldownMultiplier</key>
<value>
<multiplier>0.82</multiplier>
</value>
</li>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<multiplier>1.24</multiplier>
<offset>10</offset>
Expand Down
8 changes: 4 additions & 4 deletions Defs/InfusionDefs/Suffixes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</allowance>
<stats>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<offset>1</offset>
</value>
Expand Down Expand Up @@ -647,7 +647,7 @@
</value>
</li>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<offset>5</offset>
</value>
Expand Down Expand Up @@ -839,7 +839,7 @@
</value>
</li>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<offset>7</offset>
</value>
Expand Down Expand Up @@ -1059,7 +1059,7 @@
</value>
</li>
<li>
<key>MeleeWeapon_DamageAmount</key>
<key>MeleeWeapon_AverageDPS</key>
<value>
<offset>10</offset>
</value>
Expand Down
4 changes: 2 additions & 2 deletions Defs/SoundDefs/World_Oneshots_Infusion.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<DefPackage-SoundDef>
<Defs>

<SoundDef>
<defName>Infusion_Infused</defName>
Expand All @@ -25,4 +25,4 @@
</subSounds>
</SoundDef>

</DefPackage-SoundDef>
</Defs>
2 changes: 1 addition & 1 deletion Source/Comp/CompInfusion.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ private void throwMote()
msg.Append( parent.Stuff.LabelAsStuff + " " );
}
msg.Append( parent.def.label );
Messages.Message( ResourceBank.StringInfusionMessage.Translate( msg ), new RimWorld.Planet.GlobalTargetInfo(parent), MessageSound.Silent );
Messages.Message( ResourceBank.StringInfusionMessage.Translate( msg ), new RimWorld.Planet.GlobalTargetInfo(parent), MessageTypeDefOf.SilentInput );
InfusionSound.PlayOneShotOnCamera();

MoteMaker.ThrowText( parent.Position.ToVector3Shifted(), this.parent.Map, ResourceBank.StringInfused,
Expand Down

0 comments on commit 8542539

Please sign in to comment.