Skip to content

Commit

Permalink
鎧の孤島に対応
Browse files Browse the repository at this point in the history
  • Loading branch information
rusted-coil committed Jun 19, 2020
1 parent 3ee52e3 commit 71a9a16
Show file tree
Hide file tree
Showing 10 changed files with 315 additions and 34 deletions.
56 changes: 28 additions & 28 deletions OneStar/AdditionalNestIdTable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,21 +97,21 @@ public Data(string idNormal, string idRare, int mapIndex, int posX, int posY)
{ 156, new Data( "7956530560371257544", "2024757571205803752", 0, 0, 0)},
{ 157, new Data( "13305292637317525948", "16069264858016261892", 0, 0, 0)},
{ 158, new Data( "13563999851587423716", "502513031628180988", 0, 0, 0)},
// 離れ島海域
{ 159, new Data( "", "", 0, 0, 0)},
{ 160, new Data( "", "", 0, 0, 0)},
{ 161, new Data( "", "", 0, 0, 0)},
{ 162, new Data( "", "", 0, 0, 0)},
{ 163, new Data( "", "", 0, 0, 0)},
// 並ぶ島の海
{ 164, new Data( "", "", 0, 0, 0)},
{ 165, new Data( "", "", 0, 0, 0)},
{ 166, new Data( "", "", 0, 0, 0)},
{ 167, new Data( "", "", 0, 0, 0)},
{ 168, new Data( "", "", 0, 0, 0)},
{ 169, new Data( "", "", 0, 0, 0)},
{ 170, new Data( "", "", 0, 0, 0)},
{ 171, new Data( "", "", 0, 0, 0)},
// 離れ島海域 TODO
{ 159, new Data( "2997411918588892139", "12562706121429926817", 0, 0, 0)},
{ 160, new Data( "4780546875801935381", "18345022727441378877", 0, 0, 0)},
{ 161, new Data( "4780539179220537904", "5701091063486142270", 0, 0, 0)}, // キョダイキングラー
{ 162, new Data( "2447364886159768926", "15632276665898509590", 0, 0, 0)},
{ 163, new Data( "16341001078884806474", "9913932150092391706", 0, 0, 0)},
// 並ぶ島の海 TODO
{ 164, new Data( "6672704941776910536", "17951961757311600360", 0, 0, 0)},
{ 165, new Data( "5830741396702654597", "17953607996949684899", 0, 0, 0)},
{ 166, new Data( "13305292637317525948", "16069264858016261892", 0, 0, 0)},
{ 167, new Data( "2447364886159768926", "15632276665898509590", 0, 0, 0)},
{ 168, new Data( "11635283243122928556", "17629394089387610164", 0, 0, 0)},
{ 169, new Data( "6984833918694526192", "14413583907274219616", 0, 0, 0)},
{ 170, new Data( "7725829814153603264_Sh", "5701092162997770481", 0, 0, 0)}, // どっちかカメックス
{ 171, new Data( "342604449375897784", "8253110425161551320", 0, 0, 0)},
{ 172, new Data( "", "", 0, 0, 0)},
// 闘心の洞窟
{ 173, new Data( "4780540278732166115", "5701094362021026903", 0, 0, 0)}, // キョダイカジリガメ
Expand All @@ -120,19 +120,19 @@ public Data(string idNormal, string idRare, int mapIndex, int posX, int posY)
{ 176, new Data( "2447363786648140715", "15632275566386881379", 0, 0, 0)},
{ 177, new Data( "6984833918694526192", "14413583907274219616", 0, 0, 0)},
{ 178, new Data( "4780541378243794326", "18345017229883237822", 0, 0, 0)},
// 円環の入り江
{ 179, new Data( "", "", 0, 0, 0)},
{ 180, new Data( "", "", 0, 0, 0)},
{ 181, new Data( "", "", 0, 0, 0)},
{ 182, new Data( "", "", 0, 0, 0)},
// ワークアウトの海
{ 183, new Data( "", "", 0, 0, 0)},
{ 184, new Data( "", "", 0, 0, 0)},
{ 185, new Data( "", "", 0, 0, 0)},
{ 186, new Data( "", "", 0, 0, 0)},
{ 187, new Data( "", "", 0, 0, 0)},
{ 188, new Data( "", "", 0, 0, 0)},
{ 189, new Data( "", "", 0, 0, 0)},
// 円環の入り江 TODO
{ 179, new Data( "11635283243122928556", "17629394089387610164", 0, 0, 0)},
{ 180, new Data( "4780539179220537904", "18345015030859981400", 0, 0, 0)},
{ 181, new Data( "6589539950519384197", "3561902408726248099", 0, 0, 0)},
{ 182, new Data( "12738905581603037598", "5701095461532655114", 0, 0, 0)}, // キョダイアップリュー
// ワークアウトの海 TODO
{ 183, new Data( "7725829814153603264", "5701092162997770481", 0, 0, 0)}, // キョダイカメックス
{ 184, new Data( "12738905581603037598", "4426791916416848726", 0, 0, 0)},
{ 185, new Data( "11635283243122928556", "17629394089387610164", 0, 0, 0)},
{ 186, new Data( "7854659797556875545", "5999950843982638879", 0, 0, 0)},
{ 187, new Data( "4780546875801935381", "18345022727441378877", 0, 0, 0)},
{ 188, new Data( "14284833672245134656", "7704513452465554544", 0, 0, 0)},
{ 189, new Data( "4665094036540599430", "11519945754184084270", 0, 0, 0)}, // メタモン
};
}
}
28 changes: 25 additions & 3 deletions OneStar/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ class PokemonInfoForm {
// 言語設定可能コントロール
Dictionary<string, Control[]> m_MultiLanguageControls;

// DLCマップ用フォーム
Form2 m_MapForm = null;

class Star35PanelMode
{
public enum ModeType {
Expand Down Expand Up @@ -1510,11 +1513,30 @@ void RefreshDen()
return;
}

// 本編レイド
if (m_CurrentDenIndex >= 0)
{
var location = c_RaidData.GetRaidLocation(m_CurrentDenIndex);
f_PicturePoint.Location = new System.Drawing.Point(location.X - 5, location.Y - 5);
f_PicturePoint.Visible = true;
if (c_RaidData.GetRaidMap(m_CurrentDenIndex) == 0)
{
var location = c_RaidData.GetRaidLocation(m_CurrentDenIndex);
f_PicturePoint.Location = new System.Drawing.Point(location.X - 5, location.Y - 5);
f_PicturePoint.Visible = true;
}
else
{
// フォームが閉じていたら開く
/*
if (m_MapForm == null)
{
m_MapForm = new Form2();
m_MapForm.FormClosed += new FormClosedEventHandler((x, y) => { m_MapForm = null; });
m_MapForm.Show();
}
var location = c_RaidData.GetRaidLocation(m_CurrentDenIndex);
m_MapForm.SetPoint(location);
*/
}
}
else
{
Expand Down
79 changes: 79 additions & 0 deletions OneStar/Form2.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions OneStar/Form2.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace OneStar
{
public partial class Form2 : Form
{
public Form2()
{
InitializeComponent();

f_PicturePoint.Parent = DenMap;
f_PicturePoint.Visible = false;
}

public void SetPoint(System.Drawing.Point location)
{
f_PicturePoint.Location = new System.Drawing.Point(location.X - 5, location.Y - 5);
f_PicturePoint.Visible = true;
}
}
}
120 changes: 120 additions & 0 deletions OneStar/Form2.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
10 changes: 10 additions & 0 deletions OneStar/OneStar.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="Form2.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form2.Designer.cs">
<DependentUpon>Form2.cs</DependentUpon>
</Compile>
<Compile Include="ListGenerator.cs" />
<Compile Include="Messages.cs" />
<Compile Include="PokemonFormUtility.cs" />
Expand All @@ -120,6 +126,9 @@
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Form2.resx">
<DependentUpon>Form2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
Expand Down Expand Up @@ -156,6 +165,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="icon.ico" />
<Content Include="Resources\map2.png" />
<None Include="Resources\point.png" />
<None Include="Resources\map.png" />
</ItemGroup>
Expand Down
Loading

0 comments on commit 71a9a16

Please sign in to comment.