Skip to content

Commit

Permalink
updates for 1.6.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mudzereli committed Feb 15, 2022
1 parent e1cd1b0 commit 8d2177c
Show file tree
Hide file tree
Showing 28 changed files with 226 additions and 2,950 deletions.
5 changes: 5 additions & 0 deletions .vs/mudsort/project-colors.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
"ProjectGuid": "c2880823-67e7-4b3d-a481-9adc9847c39c",
"DisplayName": "mudsort",
"ColorIndex": 0
},
"a2fe74e1-b743-11d0-ae1a-00a0c90fffc3": {
"ProjectGuid": "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3",
"DisplayName": "Miscellaneous Files",
"ColorIndex": -1
}
},
"NextColorIndex": 1
Expand Down
Binary file modified .vs/mudsort/v17/.suo
Binary file not shown.
153 changes: 153 additions & 0 deletions Enums.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace mudsort
{
public enum MSStringValueKey
{
SecondaryName = 184549376,
Name = 1,
//Title = 5,
Inscription = 7,
InscribedBy = 8,
//FellowshipName = 10,
//UsageInstructions = 14,
SimpleDescription = 0xF,
FullDescription = 0x10,
//MonarchName = 21,
OnlyActivatedBy = 25,
//Patron = 35,
PortalDestination = 38,
LastTinkeredBy = 39,
ImbuedBy = 40//,
//DateBorn = 43,
//MonarchyTitle = 47
}
public enum MSLongValueKey
{
Type = 218103808,
Icon = 218103809,
//Container = 218103810,
//Landblock = 218103811,
ItemSlots = 218103812,
PackSlots = 218103813,
StackCount = 218103814,
StackMax = 218103815,
AssociatedSpell = 218103816,
SlotLegacy = 218103817,
//Wielder = 218103818,
WieldingSlot = 218103819,
//Monarch = 218103820,
Coverage = 218103821,
EquipableSlots = 218103822,
EquipType = 218103823,
IconOutline = 218103824,
MissileType = 218103825,
//UsageMask = 218103826,
//HouseOwner = 218103827,
//HookMask = 218103828,
//HookType = 218103829,
Model = 218103830,
//Flags = 218103831,
//CreateFlags1 = 218103832,
//CreateFlags2 = 218103833,
Category = 218103834,
//Behavior = 218103835,
//MagicDef = 218103836,
//SpecialProps = 218103837,
SpellCount = 218103838,
WeapSpeed = 218103839,
EquipSkill = 218103840,
DamageType = 218103841,
MaxDamage = 218103842,
//Unknown10 = 218103843,
//Unknown100000 = 218103844,
//Unknown800000 = 218103845,
//Unknown8000000 = 218103846,
//PhysicsDataFlags = 218103847,
//ActiveSpellCount = 218103848,
IconOverlay = 218103849,
IconUnderlay = 218103850,
//Species = 2,
Burden = 5,
EquippedSlots = 10,
RareId = 17,
Value = 19,
//TotalValue = 20,
//SkillCreditsAvail = 24,
//CreatureLevel = 25,
//RestrictedToToD = 26,
ArmorLevel = 28,
//Rank = 30,
Bonded = 33,
//NumberFollowers = 35,
Unenchantable = 36,
//LockpickDifficulty = 38,
//Deaths = 43,
WandElemDmgType = 45,
MinLevelRestrict = 86,
MaxLevelRestrict = 87,
//LockpickSkillBonus = 88,
//AffectsVitalId = 89,
//AffectsVitalAmt = 90,
HealKitSkillBonus = 90,
UsesTotal = 91,
UsesRemaining = 92,
//DateOfBirth = 98,
Workmanship = 105,
Spellcraft = 106,
CurrentMana = 107,
MaximumMana = 108,
LoreRequirement = 109,
RankRequirement = 110,
//PortalRestrictions = 111,
//Gender = 113,
Attuned = 114,
SkillLevelReq = 115,
//ManaCost = 117,
//Age = 125,
//XPForVPReduction = 129,
Material = 131,
WieldReqType = 158,
WieldReqAttribute = 159,
WieldReqValue = 160,
SlayerSpecies = 166,
//NumberItemsSalvagedFrom = 170,
NumberTimesTinkered = 171,
//DescriptionFormat = 172,
//PagesUsed = 174,
//PagesTotal = 175,
ActivationReqSkillId = 176,
//GemSettingQty = 177,
//GemSettingType = 178,
Imbued = 179,
//Heritage = 188,
//FishingSkill = 192,
//KeysHeld = 193,
ElementalDmgBonus = 204,
//CleaveType = 263,
ArmorSet = 265,
Slot = 231735296,
DamResistRating = 371,
DamRating = 370,
CritDamRating = 374,
CritDamResistRating = 375,
HealBoostRating = 376,
VitalityRating = 379
}
public enum MSBoolValueKey
{
//Lockable = 201326592,
Inscribable = 201326593,
//Open = 2,
//Locked = 3,
HookVisibility = 24,
UnlimitedUses = 0x3F,
CanBeSold = 69,
Retained = 91,
Ivoryable = 99,
Dyeable = 100//,
//AwayFromKeyboard = 110
}
}
24 changes: 18 additions & 6 deletions MainView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public static void ViewInit()
parser.ParseFromResource("mudsort.mainView.xml", out properties, out controls);
View = new VirindiViewService.HudView(properties, controls);

// set up code for underlying controls
edtSourceContainer = View != null ? (HudTextBox) View["edtSourceContainer"] : new HudTextBox();
edtDestContainer = View != null ? (HudTextBox) View["edtDestContainer"] : new HudTextBox();
edtInsertion = View != null ? (HudTextBox) View["edtInsertion"] : new HudTextBox();
Expand All @@ -63,6 +64,7 @@ public static void ViewInit()
edtSavedSortString2 = View != null ? (HudTextBox)View["edtSavedSortString2"] : new HudTextBox();
edtSavedSortString3 = View != null ? (HudTextBox)View["edtSavedSortString3"] : new HudTextBox();

// associate tooltips with controls
VirindiViewService.TooltipSystem.AssociateTooltip(View["btnSourceContainer"], "Sets the source Backpack/Person/Chest for sorting to your current Selection");
VirindiViewService.TooltipSystem.AssociateTooltip(edtSourceContainer, "The Backpack/Person/Chest the items will move from when sorted (Default = Your Character ID)");
VirindiViewService.TooltipSystem.AssociateTooltip(View["btnDestContainer"], "Sets the destination Backpack/Person/Chest for sorting to your current Selection");
Expand Down Expand Up @@ -133,24 +135,26 @@ public static void ViewInit()
{
try
{
Properties.Settings.Default.DefaultSortString = MainView.edtSortString.Text;
Properties.Settings.Default.Save();
PluginCore.getInstance().createSortFlagListFromString(((HudTextBox)View["edtSortString"]).Text);
PluginCore.getInstance().rebuildLstSortSettings();
Properties.Settings.Default.DefaultSortString = MainView.edtSortString.Text;
Properties.Settings.Default.Save();
}
catch (Exception ex) { Util.LogError(ex); }
};

View["btnCopySortString"].Hit += (s, e) =>
{
try { System.Windows.Forms.Clipboard.SetText(edtSortString.Text); }catch (Exception ex) { Util.LogError(ex); }
try { System.Windows.Forms.Clipboard.SetText(edtSortString.Text); } catch (Exception ex) { Util.LogError(ex); }
};

View["btnPasteSortString"].Hit += (s, e) =>
{
edtSortString.Text = System.Windows.Forms.Clipboard.GetText();
PluginCore.getInstance().createSortFlagListFromString(edtSortString.Text);
PluginCore.getInstance().rebuildLstSortSettings();
Properties.Settings.Default.DefaultSortString = edtSortString.Text;
Properties.Settings.Default.Save();
};

View["btnActivate"].Hit += (s, e) =>
Expand All @@ -171,6 +175,8 @@ public static void ViewInit()
{
PluginCore.getInstance().createSortFlagListFromString(edtSortString.Text);
PluginCore.getInstance().rebuildLstSortSettings();
Properties.Settings.Default.DefaultSortString = edtSortString.Text;
Properties.Settings.Default.Save();
};


Expand Down Expand Up @@ -206,7 +212,7 @@ public static void ViewInit()
catch (Exception ex) { Util.LogError(ex); }
};

edtSavedSortString1.KeyEvent += (s, e) =>
edtSavedSortString1.Change += (s, e) =>
{
try
{
Expand All @@ -216,7 +222,7 @@ public static void ViewInit()
catch (Exception ex) { Util.LogError(ex); }
};

edtSavedSortString2.KeyEvent += (s, e) =>
edtSavedSortString2.Change += (s, e) =>
{
try
{
Expand All @@ -226,7 +232,7 @@ public static void ViewInit()
catch (Exception ex) { Util.LogError(ex); }
};

edtSavedSortString3.KeyEvent += (s, e) =>
edtSavedSortString3.Change += (s, e) =>
{
try
{
Expand All @@ -250,6 +256,8 @@ public static void ViewInit()
try
{
edtSavedSortString1.Text = System.Windows.Forms.Clipboard.GetText();
Properties.Settings.Default.SavedSortString1 = edtSavedSortString1.Text;
Properties.Settings.Default.Save();
}
catch (Exception ex) { Util.LogError(ex); }
};
Expand All @@ -268,6 +276,8 @@ public static void ViewInit()
try
{
edtSavedSortString2.Text = System.Windows.Forms.Clipboard.GetText();
Properties.Settings.Default.SavedSortString2 = edtSavedSortString2.Text;
Properties.Settings.Default.Save();
}
catch (Exception ex) { Util.LogError(ex); }
};
Expand All @@ -286,6 +296,8 @@ public static void ViewInit()
try
{
edtSavedSortString3.Text = System.Windows.Forms.Clipboard.GetText();
Properties.Settings.Default.SavedSortString3 = edtSavedSortString3.Text;
Properties.Settings.Default.Save();
}
catch (Exception ex) { Util.LogError(ex); }
};
Expand Down
6 changes: 3 additions & 3 deletions PluginCore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -372,13 +372,13 @@ public void rebuildLstSortSettings()
foreach (SortFlag iFlag in SortFlag.sortedFlagList.Values)
{
int id = 6;
if (iFlag.key is StringValueKey) {
if (iFlag.key is MSStringValueKey) {
id = 2;
} else if (iFlag.key is LongValueKey) {
} else if (iFlag.key is MSLongValueKey) {
id = 3;
} else if (iFlag.key is DoubleValueKey) {
id = 4;
} else if (iFlag.key is BoolValueKey) {
} else if (iFlag.key is MSBoolValueKey) {
id = 5;
}
bool common = false;
Expand Down
6 changes: 3 additions & 3 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mudzereli")]
[assembly: AssemblyProduct("MudSort")]
[assembly: AssemblyCopyright("Copyright © Mudzereli 2014")]
[assembly: AssemblyCopyright("Copyright © Mudzereli 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,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("1.5.1.0")]
[assembly: AssemblyFileVersion("1.5.1.0")]
[assembly: AssemblyVersion("1.6.0.0")]
[assembly: AssemblyFileVersion("1.6.0.0")]
2 changes: 1 addition & 1 deletion Properties/Settings.Designer.cs

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

2 changes: 1 addition & 1 deletion Properties/Settings.settings
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Value Profile="(Default)">OC,ES,CV,AL-,AB-,DG-,ED-,ML,MA,NM</Value>
</Setting>
<Setting Name="IdentifyOnLogin" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="ReverseSortList" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
Expand Down
Loading

0 comments on commit 8d2177c

Please sign in to comment.