Ticket #4015: change4015.patch
File change4015.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
3829 3829 // Special cases of orders that shouldn't be replaced: 3830 3830 // 1. Cheering - we're invulnerable, add order after we finish 3831 3831 // 2. Packing/unpacking - we're immobile, add order after we finish (unless it's cancel) 3832 // 2./1. If order is a move, we cancel packing immediately and then add the moving order 3832 3833 // TODO: maybe a better way of doing this would be to use priority levels 3833 3834 if (this.order && this.order.type == "Cheering") 3834 3835 { … … 3836 3837 var cheeringOrder = this.orderQueue.shift(); 3837 3838 this.orderQueue = [cheeringOrder, order]; 3838 3839 } 3839 else if (this.IsPacking() && type != "CancelPack" && type != "CancelUnpack" )3840 else if (this.IsPacking() && type != "CancelPack" && type != "CancelUnpack" && type != "Walk") 3840 3841 { 3841 3842 var order = { "type": type, "data": data }; 3842 3843 var packingOrder = this.orderQueue.shift(); 3843 3844 this.orderQueue = [packingOrder, order]; 3844 3845 } 3846 else if (this.IsPacking() && type == "Walk") 3847 { 3848 this.orderQueue = []; 3849 this.PushOrder("CancelUnpack", { "force": true }); 3850 this.PushOrder(type, data); 3851 } 3845 3852 else 3846 3853 { 3847 3854 this.orderQueue = [];