Skip to content

Commit

Permalink
R17.1 for game version 1.11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
MyShiLingStar authored and MyShiLingStar committed Sep 20, 2021
1 parent ffe38c9 commit 5505e2e
Showing 8 changed files with 41 additions and 41 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -240,6 +240,9 @@ https://youtu.be/-zztRgmtXig
* R17
* Update for Game version number 1.11.0
* Adjust the regen rate of Map Regenerator during idle time. Max idle time is about 1 minute.
* R17.1
* Update for Game version number 1.11.1
* Rework the "Setting" for easier future update.

## Contributing

15 changes: 1 addition & 14 deletions acnhpoker/App.config
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<add key="Turnip" value="ADD1BB84" />
<add key="Stamina" value="B5F64090" />
<add key="WalkSpeed" value="0114A670" />
<add key="AnimationSpeed" value="037F9200" />
<add key="AnimationSpeed" value="037FA200" />
<add key="Collision" value="010B7420" />
<add key="FreezeTime" value="0027DD60" />
<add key="ReadTime" value="0BAC6338" />
@@ -29,7 +29,6 @@
<add key="Sound" value="true" />
<add key="LastSave" value="" />
<add key="LastLoad" value="" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
@@ -59,16 +58,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>
2 changes: 1 addition & 1 deletion acnhpoker/Dodo/teleport.cs
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ public partial class teleport : Form
private static byte[] teleportByte;
private static byte[] anchorByte;

private static string offset = "[[[[main+3A32980]+18]+178]+D0]+DA"; //"[[[[main+3A08B40]+18]+178]+D0]+DA"; //"[[[[main+39DC030]+18]+178]+D0]+DA";//"[[[[main+398C380]+18]+178]+D0]+DA";//"[[[[main+396F5A0]+18]+178]+D0]+DA";
private static string offset = "[[[[main+3A33980]+18]+178]+D0]+DA"; //"[[[[main+3A32980]+18]+178]+D0]+DA"; //"[[[[main+3A08B40]+18]+178]+D0]+DA"; //"[[[[main+39DC030]+18]+178]+D0]+DA";//"[[[[main+398C380]+18]+178]+D0]+DA";//"[[[[main+396F5A0]+18]+178]+D0]+DA";
private static readonly long[] PlayerCoordJumps = new long[5] { 0x396F5A0L, 0x18L, 0x178L, 0xD0L, 0xDAL };


2 changes: 1 addition & 1 deletion acnhpoker/Form1.cs
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ public partial class Form1 : Form
{
#region variable
private static Socket s;
private string version = "ACNH Poker R17 for v1.11.0";
private string version = "ACNH Poker R17.1 for v1.11.1";
private inventorySlot selectedButton;
private Villager[] V = null;
private Button[] villagerButton = null;
4 changes: 2 additions & 2 deletions acnhpoker/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -32,6 +32,6 @@
// 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("17.0.0.0")]
[assembly: AssemblyFileVersion("17.0.0.0")]
[assembly: AssemblyVersion("17.1.0.0")]
[assembly: AssemblyFileVersion("17.1.0.0")]
[assembly: NeutralResourcesLanguage("en-US")]
20 changes: 0 additions & 20 deletions acnhpoker/Setting/Setting.Designer.cs

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

34 changes: 32 additions & 2 deletions acnhpoker/Setting/Setting.cs
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ public partial class Setting : Form
{
Form1 mainForm;
bool sound;
bool startup = true;
public Setting(Form1 main, bool overrideSetting, bool disableValidation, bool Sound)
{
InitializeComponent();
@@ -20,19 +21,44 @@ public Setting(Form1 main, bool overrideSetting, bool disableValidation, bool So

if (overrideSetting)
{
enableOverrideBtn.BackColor = Color.Red;
enableOverrideBtn.Text = "Disable Override";
this.addresses.Enabled = true;
}

if (disableValidation)
{
disableValidationBtn.BackColor = Color.Red;
disableValidationBtn.Text = "Enable Validation";
}

if (!sound)
{
soundBtn.Text = "Enable Sound";
}

this.PlayerSlot.Text = Utilities.player1SlotBase.ToString("X");
this.PlayerOffset.Text = Utilities.playerOffset.ToString("X");
this.Slot21Offset.Text = Utilities.Slot21Offset.ToString("X");
this.HomeOffset.Text = Utilities.HomeOffset.ToString("X");
this.ReactionOffset.Text = Utilities.ReactionOffset.ToString("X");
this.Villager.Text = Utilities.VillagerAddress.ToString("X");
this.VillagerOffset.Text = Utilities.VillagerSize.ToString("X");
this.VillagerHouse.Text = Utilities.VillagerHouseAddress.ToString("X");
this.VillagerHouseOffset.Text = Utilities.VillagerHouseSize.ToString("X");
this.VillagerHouseBuffer.Text = Utilities.VillagerHouseBufferDiff.ToString("X");
this.RecyclingBin.Text = Utilities.MasterRecyclingBase.ToString("X");
this.Turnip.Text = Utilities.TurnipPurchasePriceAddr.ToString("X");
this.Stamina.Text = Utilities.precedingZeros(Utilities.staminaAddress.ToString("X"), 8);
this.WalkSpeed.Text = Utilities.precedingZeros(Utilities.wSpeedAddress.ToString("X"), 8);
this.AnimationSpeed.Text = Utilities.precedingZeros(Utilities.aSpeedAddress.ToString("X"), 8);
this.Collision.Text = Utilities.precedingZeros(Utilities.CollisionAddress.ToString("X"), 8);
this.FreezeTime.Text = Utilities.precedingZeros(Utilities.freezeTimeAddress.ToString("X"), 8);
this.ReadTime.Text = Utilities.precedingZeros(Utilities.readTimeAddress.ToString("X"), 8);
this.WeatherSeed.Text = Utilities.weatherSeed.ToString("X");
this.MapZero.Text = Utilities.mapZero.ToString("X");

startup = false;
}

private void enableOverrideBtn_Click(object sender, EventArgs e)
@@ -47,6 +73,7 @@ private void enableOverrideBtn_Click(object sender, EventArgs e)
Config.AppSettings.Settings["override"].Value = "false";
Config.Save(ConfigurationSaveMode.Minimal);
enableOverrideBtn.Text = "Enable Override";
enableOverrideBtn.BackColor = Color.FromArgb(114, 137, 218);
this.addresses.Enabled = false;
resetAddresses();
}
@@ -59,6 +86,7 @@ private void enableOverrideBtn_Click(object sender, EventArgs e)
Config.AppSettings.Settings["override"].Value = "true";
Config.Save(ConfigurationSaveMode.Minimal);
enableOverrideBtn.Text = "Disable Override";
enableOverrideBtn.BackColor = Color.Red;
this.addresses.Enabled = true;
overrideAddresses();
}
@@ -80,7 +108,7 @@ private void disableValidationBtn_Click(object sender, EventArgs e)
Config.AppSettings.Settings["disableValidation"].Value = "false";
Config.Save(ConfigurationSaveMode.Minimal);
disableValidationBtn.Text = "Disable Validation";

disableValidationBtn.BackColor = Color.FromArgb(114, 137, 218);
mainForm.toggleValidation();
}
else
@@ -91,7 +119,7 @@ private void disableValidationBtn_Click(object sender, EventArgs e)
Config.AppSettings.Settings["disableValidation"].Value = "true";
Config.Save(ConfigurationSaveMode.Minimal);
disableValidationBtn.Text = "Enable Validation";

disableValidationBtn.BackColor = Color.Red;
mainForm.toggleValidation();
}
}
@@ -233,6 +261,8 @@ private void BoxValidating(object sender, CancelEventArgs e)

private void BoxTextChanged(object sender, EventArgs e)
{
if (startup)
return;
TextBox box = (TextBox)sender;
box.ForeColor = Color.Red;
}
2 changes: 1 addition & 1 deletion acnhpoker/Utilities.cs
Original file line number Diff line number Diff line change
@@ -180,7 +180,7 @@ class Utilities
public static readonly string CollisionDisable = "12800014";
public static readonly string CollisionEnable = "B9572814";

public static UInt32 aSpeedAddress = 0x037F9200; //0x037D0090; //0x037A41E8;
public static UInt32 aSpeedAddress = 0x037FA200; //0x037F9200; //0x037D0090; //0x037A41E8;
public static readonly string aSpeedX1 = "3F800000";
public static readonly string aSpeedX2 = "40000000";
public static readonly string aSpeedX5 = "40A00000";

0 comments on commit 5505e2e

Please sign in to comment.