Ticket #4015: change4015.2.patch
File change4015.2.patch, 2.2 KB (added by , 7 years ago) |
---|
-
binaries/data/mods/public/gui/credits/texts/programming.json
141 141 {"nick": "njm"}, 142 142 {"nick": "NoMonkey", "name": "John Mena"}, 143 143 {"nick": "notpete", "name": "Rich Cross"}, 144 {"nick": "odoaker", "name": "Agoston Sipos"} 144 145 {"nick": "Offensive ePeen", "name": "Jared Ryan Bills"}, 145 146 {"nick": "Ols", "name": "Oliver Whiteman"}, 146 147 {"nick": "olsner", "name": "Simon Brenner"}, -
binaries/data/mods/public/simulation/components/UnitAI.js
3835 3835 // Special cases of orders that shouldn't be replaced: 3836 3836 // 1. Cheering - we're invulnerable, add order after we finish 3837 3837 // 2. Packing/unpacking - we're immobile, add order after we finish (unless it's cancel) 3838 // 2./1. If order is a move (or out of range attack), we cancel packing immediately and then add the moving order 3838 3839 // TODO: maybe a better way of doing this would be to use priority levels 3839 3840 if (this.order && this.order.type == "Cheering") 3840 3841 { … … 3844 3845 } 3845 3846 else if (this.IsPacking() && type != "CancelPack" && type != "CancelUnpack") 3846 3847 { 3847 var order = { "type": type, "data": data }; 3848 var packingOrder = this.orderQueue.shift(); 3849 this.orderQueue = [packingOrder, order]; 3848 if(this.ShouldUnpack(type, data)) 3849 { 3850 this.orderQueue = []; 3851 this.PushOrder("CancelPack", { "force": true }); 3852 } 3853 else 3854 { 3855 this.orderQueue = []; 3856 this.PushOrder("CancelUnpack", { "force": true }); 3857 } 3858 this.PushOrder(type, data); 3850 3859 } 3851 3860 else 3852 3861 { … … 5960 5969 return (cmpPack && cmpPack.IsPacking()); 5961 5970 }; 5962 5971 5972 UnitAI.prototype.ShouldUnpack = function(type, data) 5973 { 5974 return type == "Attack" && this.CheckTargetAttackRange(data.target, this.GetBestAttackAgainst(data.target, false)); 5975 }; 5976 5963 5977 //// Formation specific functions //// 5964 5978 5965 5979 UnitAI.prototype.IsAttackingAsFormation = function()