Merge pull request #951 from hyamw/master

+ Add plugin for find plantera bulb
TEdit · Apr 15, 2017 · ed868e6 · ed868e6
2 parents 8203687 + 26edb1f
commit ed868e6
Show file tree

Hide file tree

Showing 11 changed files with 120 additions and 5 deletions.
diff --git a/TEditXna/Editor/Plugins/FindChestWithPluginResultView.xaml b/TEditXna/Editor/Plugins/FindChestWithPluginResultView.xaml
@@ -9,6 +9,6 @@
             <Button Margin="5" Content="Close" HorizontalAlignment="Center" Padding="20, 3" Click="CloseButtonClick" />
         </Grid>
 
-        <ListBox Name="LocationList"/>
+        <ListBox Name="LocationList" MouseDoubleClick="ListBoxMouseDoubleClick"/>
     </DockPanel>
 </Window>
diff --git a/TEditXna/Editor/Plugins/FindChestWithPluginResultView.xaml.cs b/TEditXna/Editor/Plugins/FindChestWithPluginResultView.xaml.cs
@@ -19,6 +19,7 @@ namespace TEditXna.Editor.Plugins
     /// </summary>
     public partial class FindChestWithPluginResultView : Window
     {
+        private char[] splitters = new char[] { ',' };
         public FindChestWithPluginResultView(IEnumerable<Vector2> locations)
         {
             InitializeComponent();
@@ -33,5 +34,31 @@ public void CloseButtonClick(object sender, RoutedEventArgs routedEventArgs)
         {
             this.Close();
         }
+
+        private void ListBoxMouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if ( e.OriginalSource is TextBlock )
+            {
+                TextBlock item = e.OriginalSource as TextBlock;
+                if ( !string.IsNullOrEmpty(item.Text) )
+                {
+                    string[] positions = item.Text.Split(splitters);
+                    if ( positions.Length == 2 )
+                    {
+                        int x = 0;
+                        int y = 0;
+
+                        if ( int.TryParse(positions[0].Trim(), out x) && int.TryParse(positions[1].Trim(), out y) )
+                        {
+                            MainWindow mainwin = Application.Current.MainWindow as MainWindow;
+                            if (mainwin != null)
+                            {
+                                mainwin.ZoomFocus(x, y);
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/TEditXna/Editor/Plugins/FindPlanteraBulbPlugin.cs b/TEditXna/Editor/Plugins/FindPlanteraBulbPlugin.cs
@@ -0,0 +1,62 @@
+using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using TEditXna.ViewModel;
+using TEditXNA.Terraria;
+
+namespace TEditXna.Editor.Plugins
+{
+    class FindPlanteraBulbPlugin : BasePlugin
+    {
+        public FindPlanteraBulbPlugin(WorldViewModel worldViewModel)
+            : base(worldViewModel)
+        {
+            Name = "Find Plantera's Bulb";
+        }
+
+        public override void Execute()
+        {
+            if (_wvm.CurrentWorld == null) return;
+
+            List<Vector2> locations = new List<Vector2>();
+
+            // Search the whole World
+            for (int x = 0; x < _wvm.CurrentWorld.TilesWide; x++)
+            {
+                for (int y = 0; y < _wvm.CurrentWorld.TilesHigh; y++)
+                {
+                    // Check if a tile is a chest
+                    if (_wvm.CurrentWorld.Tiles[x, y].Type == (int)TileType.PlanteraBulb)
+                    {
+                        if (!findConnectedTitle(locations, x, y))
+                        {
+                            locations.Add(new Vector2(x, y));
+                        }
+                    }
+                }
+            }
+
+            // show the result view with the list of locations
+            FindChestWithPluginResultView resultView = new FindChestWithPluginResultView(locations);
+            resultView.Show();
+        }
+
+        protected bool findConnectedTitle(List<Vector2> locations, int x, int y)
+        {
+            Vector2 position;
+            for ( int i = 0; i < locations.Count; i++ )
+            {
+                position = locations[i];
+                if ( Math.Abs((int)position.X - x) <= 1 && Math.Abs((int)position.Y - y) <= 1 )
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}
diff --git a/TEditXna/MainWindow.xaml b/TEditXna/MainWindow.xaml
@@ -224,7 +224,7 @@
                     </TabItem>
                 </TabControl>
             </Expander>
-            <View:WorldRenderXna HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+            <View:WorldRenderXna x:Name="MapView" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
         </DockPanel>
     </Grid>
 </Window>
diff --git a/TEditXna/MainWindow.xaml.cs b/TEditXna/MainWindow.xaml.cs
@@ -180,5 +180,13 @@ private void SetActiveTool(string toolName)
                 _vm.SetTool.Execute(tool);
         }
 
+        public void ZoomFocus(int x, int y)
+        {
+            if (this.MapView != null)
+            {
+                this.MapView.ZoomFocus(x, y);
+            }
+        }
+
     }
 }
diff --git a/TEditXna/Properties/AssemblyInfo.cs b/TEditXna/Properties/AssemblyInfo.cs
@@ -45,7 +45,7 @@
 //
 
 [assembly: AssemblyVersion("3.9.0.0")]
-[assembly: AssemblyFileVersion("3.9.16348.0006")]
+[assembly: AssemblyFileVersion("3.9.16365.0959")]
 
 
 [assembly: XmlnsDefinition("http://tedit/wpf", "TEdit.UI.Xaml")]

diff --git a/TEditXna/TEditXna.csproj b/TEditXna/TEditXna.csproj
@@ -126,6 +126,7 @@
     <Compile Include="Editor\Plugins\FindChestWithPluginResultView.xaml.cs">
       <DependentUpon>FindChestWithPluginResultView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Editor\Plugins\FindPlanteraBulbPlugin.cs" />
     <Compile Include="Editor\Plugins\IPlugin.cs" />
     <Compile Include="Editor\Plugins\PerlinNoise.cs" />
     <Compile Include="Editor\Plugins\RemoveAllChestsPlugin.cs" />
@@ -566,4 +567,4 @@
   <!--<Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/TEditXna/Terraria/Tile.cs b/TEditXna/Terraria/Tile.cs
@@ -43,6 +43,7 @@ public enum TileType : int
         EbonsandBlock = 112,
         PearlsandBlock = 116,
         CrimsandBlock = 234,
+        PlanteraBulb = 238,
         IceByRod = 127,
         Timer = 144,
         AnnouncementBox = 425,

diff --git a/TEditXna/View/WorldRenderXna.xaml.cs b/TEditXna/View/WorldRenderXna.xaml.cs
@@ -2085,6 +2085,21 @@ public void Zoom(int direction)
             }
         }
 
+        public void ZoomFocus(int x, int y)
+        {
+            _zoom = 8;
+            CenterOnTile(x, y);
+
+            if (_wvm.CurrentWorld != null)
+            {
+                var r = GetViewingArea();
+                ScrollBarH.ViewportSize = r.Width;
+                ScrollBarV.ViewportSize = r.Height;
+                ScrollBarH.Maximum = _wvm.CurrentWorld.TilesWide - ScrollBarH.ViewportSize;
+                ScrollBarV.Maximum = _wvm.CurrentWorld.TilesHigh - ScrollBarV.ViewportSize;
+            }
+        }
+
 
 
         private void xnaViewport_HwndMButtonDown(object sender, HwndMouseEventArgs e)

diff --git a/TEditXna/ViewModel/ViewModelLocator.cs b/TEditXna/ViewModel/ViewModelLocator.cs
@@ -49,6 +49,7 @@ private static WorldViewModel CreateWorldViewModel()
             wvm.Plugins.Add(new RemoveAllUnlockedChestsPlugin(wvm));
             wvm.Plugins.Add(new UnlockAllChestsPlugin(wvm));
             wvm.Plugins.Add(new FindChestWithPlugin(wvm));
+            wvm.Plugins.Add(new FindPlanteraBulbPlugin(wvm));
             return wvm;
         }
     }

diff --git a/teditversion.txt b/teditversion.txt
@@ -1 +1 @@
-v3.9.0.0
+v3.9.16365.0959