Skip to content

Commit

Permalink
Merge pull request #4 from Mag-nus/master
Browse files Browse the repository at this point in the history
FragDatListToolForm add
  • Loading branch information
tfarley authored Mar 12, 2017
2 parents c843f04 + 28aec73 commit 5e010b5
Show file tree
Hide file tree
Showing 16 changed files with 1,554 additions and 91 deletions.
18 changes: 12 additions & 6 deletions aclogview/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,18 @@
</startup>
<userSettings>
<aclogview.Properties.Settings>
<setting name="FindOpcodeInFilesRoot" serializeAs="String">
<value />
</setting>
<setting name="FindOpcodeInFilesOpcode" serializeAs="String">
<value>0</value>
</setting>
<setting name="FindOpcodeInFilesRoot" serializeAs="String">
<value />
</setting>
<setting name="FindOpcodeInFilesOpcode" serializeAs="String">
<value>0</value>
</setting>
<setting name="FragDatFileToProcess" serializeAs="String">
<value />
</setting>
<setting name="FragDatFileOutputFolder" serializeAs="String">
<value />
</setting>
</aclogview.Properties.Settings>
</userSettings>
</configuration>
2 changes: 1 addition & 1 deletion aclogview/CM_Physics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ public void contributeToTreeNode(TreeNode node) {
}
TreeNode timestampsNode = node.Nodes.Add("timestamps = ");
for (int i = 0; i < timestamps.Length; ++i) {
timestampsNode.Nodes.Add(timestamps[i].ToString());
timestampsNode.Nodes.Add("[" + i + "] = " + timestamps[i]);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion aclogview/Enums/Item.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public enum ITEM_TYPE {
TYPE_ITEM = 3013615,
TYPE_REDIRECTABLE_ITEM_ENCHANTMENT_TARGET = 33031,
TYPE_ITEM_ENCHANTABLE_TARGET = 560015,
TYPE_SELF = 0,
//TYPE_SELF = 0, This is a duplicate of TYPE_UNDEF
TYPE_VENDOR_SHOPKEEP = 1208248231,
TYPE_VENDOR_GROCER = 4481568
}
Expand Down
46 changes: 40 additions & 6 deletions aclogview/FindOpcodeInFilesForm.Designer.cs

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

Loading

0 comments on commit 5e010b5

Please sign in to comment.