Skip to content

Commit

Permalink
Updated todo and notes
Browse files Browse the repository at this point in the history
  • Loading branch information
Rartrin committed Jul 3, 2020
1 parent 4808181 commit dc70e78
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 33 deletions.
32 changes: 1 addition & 31 deletions Porting Notes for 1.4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,34 +47,4 @@
-
if (Clients[k].IsConnected()) {
if (!Clients[k].IsActive)
Clients[k].State = 0;

//Player.ApplyAnnimation was moved
private void ApplyAnimation(Item sItem) {
if (sItem.melee) {
- itemAnimation = (int)((float)sItem.useAnimation * meleeSpeed);
- itemAnimationMax = (int)((float)sItem.useAnimation * meleeSpeed);
+ itemAnimation = PlayerHooks.TotalMeleeTime(sItem.useAnimation * meleeSpeed, this, sItem);
+ itemAnimationMax = itemAnimation;
}
else if (sItem.createTile >= 0) {
- itemAnimation = (int)((float)sItem.useAnimation * tileSpeed);
- itemAnimationMax = (int)((float)sItem.useAnimation * tileSpeed);
+ itemAnimation = PlayerHooks.TotalMeleeTime(sItem.useAnimation * tileSpeed, this, sItem);
+ itemAnimationMax = itemAnimation;
}
else if (sItem.createWall >= 0) {
- itemAnimation = (int)((float)sItem.useAnimation * wallSpeed);
- itemAnimationMax = (int)((float)sItem.useAnimation * wallSpeed);
+ itemAnimation = PlayerHooks.TotalMeleeTime(sItem.useAnimation * wallSpeed, this, sItem);
+ itemAnimationMax = itemAnimation;
}
else {
- itemAnimation = sItem.useAnimation;
- itemAnimationMax = sItem.useAnimation;
- reuseDelay = sItem.reuseDelay;
+ itemAnimation = PlayerHooks.TotalMeleeTime(sItem.useAnimation, this, sItem);
+ itemAnimationMax = itemAnimation;
+ reuseDelay = (int)(sItem.reuseDelay / PlayerHooks.TotalUseTimeMultiplier(this, sItem));
}
}
Clients[k].State = 0;
1 change: 0 additions & 1 deletion patching_todo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
//Need reimplementing:
//TileLoader.DisableSmartInteract
//TileLoader.HasSmartInteract
//"Enable Developer Mode" button
//NPCLoader.CanChat
//Add to NPCSmartInteractCandidateProvider.ProvideCandidate's npc loop checks.
//TileLoader.FixSmartInteractCoords
Expand Down
4 changes: 3 additions & 1 deletion reworking_todo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@
//TileEntity
//We should easily be able to remove all patches to the TileEntity class by doing the following:
//Make ModTileEntity use new abstracted vanilla TileEntityManager.
//Always use "is" check on TileEntity rather than id>= to determine a ModTileEntity.
//Always use "is" check on TileEntity rather than id>= to determine a ModTileEntity.
//GameContent.ItemShopSellbackHelper
//Worth keeping track of item data?

0 comments on commit dc70e78

Please sign in to comment.