Updated blocks for 1.2.1.2

mrkite · Nov 1, 2013 · c65c9cc · c65c9cc
1 parent 26a493c
commit c65c9cc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/Terrafirma/MainWindow.xaml.cs b/Terrafirma/MainWindow.xaml.cs
@@ -435,7 +435,7 @@ class NPC
     /// </summary>
     public partial class MainWindow : Window, IDisposable
     {
-        const int MapVersion = 72;
+        const int MapVersion = 73;
         const int MaxTile = 254;
         const int MaxWall = 115;
         const int Widest = 8400;

diff --git a/Terrafirma/Properties/AssemblyInfo.cs b/Terrafirma/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]
diff --git a/Terrafirma/tiles.xml b/Terrafirma/tiles.xml
@@ -294,6 +294,9 @@
   <tile num="40" name="Clay" color="#925144" solid="1" blend="0" />
   <tile num="41" name="Blue Brick" color="#454E63" solid="1" blend="0" merge="1" />
   <tile num="42" name="Chain Lantern" color="#F99851" hasExtra="1" letLight="1">
+    <var minv="324" name="Heart Lantern" color="#F57FAE">
+      <var u="0" lightr="0.7" lightg="0.7" lightb="0.9" light="0.75" />
+    </var>
     <var minv="288" name="Hanging Jack 'O Lantern" color="#E28221">
       <var u="0" lightr="0.7" lightg="0.7" lightb="0.9" light="0.75" />
     </var>
@@ -3077,6 +3080,15 @@
   <item num="1855" name="Mourning Wood Trophy" />
   <item num="1856" name="Pumpking Trophy" />
   <item num="1857" name="Jack 'O Lantern Mask" />
+  <item num="1858" name="Sniper Scope" />
+  <item num="1859" name="Heart Lantern" />
+  <item num="1860" name="Jellyfish Diving Gear" />
+  <item num="1861" name="Arctic Diving Gear" />
+  <item num="1862" name="Frostspark Boots" />
+  <item num="1863" name="Fart in a Balloon" />
+  <item num="1864" name="Papyrus Scarab" />
+  <item num="1865" name="Celestial Stone" />
+  <item num="1866" name="Hoverboard" />
 
   <global id="sky" color="#84AAF8" />
   <global id="earth" color="#583D2E" />

diff --git a/terrafirma.wxs b/terrafirma.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Increase product version each release.. and that's the only change -->
-<?define ProductVersion="2.1.0.0"?>
+<?define ProductVersion="2.1.1.0"?>
 <?define ProductUpgradeCode="77851f13-31d3-473a-8654-5b6325fc53ab"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Product Id="*" Name="Terrafirma" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Sean Kasun" UpgradeCode="$(var.ProductUpgradeCode)">
@@ -33,7 +33,7 @@
 			<Component Id="terrafirma.exe" Guid="9fcfa381-6ed4-4a7e-aebb-a27e10b0a022">
 				<File Id="terrafirma.exe" Source="Terrafirma\bin\Release\Terrafirma.exe" KeyPath="yes" Checksum="yes">
 					<Shortcut Id="ApplicationShortcut" Directory="ApplicationProgramsFolder" Advertise="yes" Name="Terrafirma" WorkingDirectory="INSTALLDIR" Icon="icon.exe">
-						<Icon Id="icon.exe" SourceFile="Terrafirma\bin\Release\Terrafirma.exe" />
+						<Icon Id="icon.exe" SourceFile="Terrafirma\terrafirma.ico" />
 					</Shortcut>
 				</File>
 				<RemoveFolder Id="DeleteShortcutFolder" Directory="ApplicationProgramsFolder" On="uninstall" />