Merge branch 'main' into development

msu/hooks/ai/tactical/behaviors/ai_switchto_melee.nut

@@ -3,6 +3,8 @@
 	o.onExecute = function( _entity )
 	{
 		local itemsBefore = array(::Const.ItemSlot.COUNT);
+		// We need to cache this as it is set to false in onExecute
+		local wasNegatingDisarm = this.m.IsNegatingDisarm;
 		for (local i = 0; i < ::Const.ItemSlot.COUNT; i++)
 		{
 			itemsBefore[i] = clone _entity.getItems().m.Items[i];
@@ -14,8 +16,10 @@
 
 		if (ret)
 		{
-			if (this.m.IsNegatingDisarm)
+			if (wasNegatingDisarm)
 			{
+				// Once to use up quickhands, once to actually pay for the cost
+				_entity.getItems().payForAction([_entity.getMainhandItem()]);
 				_entity.getItems().payForAction([_entity.getMainhandItem()]);
 			}
 			else

msu/hooks/items/item_container.nut

@@ -46,27 +46,15 @@
 
 	o.getStaminaModifier <- function( _slots = null )
 	{
-		if (_slots == null)
-		{
-			 _slots = clone ::Const.ItemSlot;
-			 delete _slots.None;
-			 delete _slots.COUNT;
-		}
-		else
-		{
-			if (typeof _slots == "integer") _slots = [_slots];
-		}
-
 		local ret = 0;
 
-		foreach (slot in _slots)
+		if (_slots == null) _slots = ::Const.ItemSlotSpaces; // We use the ItemSlotSpaces array because its indices align perfectly with the actually usable ItemSlots
+		else if (typeof _slots == "integer") _slots = [_slots];
+
+		for (local i = 0; i < _slots.len(); i++)
 		{
-			local items = this.getAllItemsAtSlot(slot);
-			foreach (item in items)
+			foreach (item in this.getAllItemsAtSlot(_slots == ::Const.ItemSlotSpaces ? i : _slots[i]))
 			{
-				// Avoid exceptions for items which don't have getStaminaModifier()
-				// This handles cases such as Quivers in ammo slot which don't have
-				// this function in vanilla but do in mods like Legends
 				if (::MSU.isIn("getStaminaModifier", item, true)) ret += item.getStaminaModifier();
 			}
 		}

msu/hooks/items/weapons/weapon.nut

@@ -39,6 +39,7 @@
 		local ret = addSkill(_skill);
 		if (::MSU.isIn("AdditionalAccuracy", _skill.m, true))
 		{
+			_skill.resetField("AdditionalAccuracy");
 			_skill.m.AdditionalAccuracy += this.m.AdditionalAccuracy;
 			_skill.setBaseValue("AdditionalAccuracy", _skill.m.AdditionalAccuracy);
 		}

msu/hooks/skills/skill.nut

@@ -48,9 +48,6 @@
 						this.m.DamageType.add(::Const.Damage.DamageType.Unknown);
 				}
 			}
-
-			if (this.getID() in ::MSU.AI.VanillaSkillIDToBehaviorIDMap)
-				this.m.AIBehaviorID = ::MSU.AI.VanillaSkillIDToBehaviorIDMap[this.getID()];
 		}
 	}
 });
@@ -238,10 +235,14 @@
 		this.saveBaseValues();
 		setContainer(_c);
 
-		if (this.m.AIBehaviorID != null && this.getContainer().getActor().getAIAgent().getID() != ::Const.AI.Agent.ID.Player)
+		if (this.m.AIBehaviorID != null && !::MSU.isNull(this.getContainer().getActor()))
 		{
-			this.getContainer().getActor().getAIAgent().addBehavior(::new(::MSU.AI.getBehaviorScriptFromID(this.m.AIBehaviorID)));
-			this.getContainer().getActor().getAIAgent().finalizeBehaviors();
+			local agent = this.getContainer().getActor().getAIAgent();
+			if (!::MSU.isNull(agent) && agent.getID() != ::Const.AI.Agent.ID.Player)
+			{
+				agent.addBehavior(::new(::MSU.AI.getBehaviorScriptFromID(this.m.AIBehaviorID)));
+				agent.finalizeBehaviors();
+			}
 		}
 	}
 

msu/systems/keybinds/key_static.nut

@@ -76,6 +76,17 @@
 		}
 	}
 
+	function getMouseState( _rawMouseState )
+	{
+		switch (_rawMouseState)
+		{
+			case 0:
+				return this.KeyState.Press;
+			case 1:
+				return this.KeyState.Release;
+		}
+	}
+
 	function isKnownKey( _key )
 	{
 		return _key.getKey().tostring() in this.KeyMapSQ;
@@ -200,7 +211,7 @@
 	},
 	ReverseKeyMapJS = {
 		"backspace" : "8",
-		"tabulator" : "9",
+		"tab" : "9",
 		"return" : "13",
 		"shift" : "16",
 		"ctrl" : "17",

msu/systems/keybinds/keybinds_system.nut

@@ -186,7 +186,7 @@
 	function onMouseInput( _mouse, _environment, _state )
 	{
 		local keyAsString = ::MSU.Key.MouseMapSQ[_mouse.getID().tostring()];
-		return this.onInput(_mouse, _environment, _state, keyAsString, _mouse.getState());
+		return this.onInput(_mouse, _environment, _state, keyAsString, ::MSU.Key.getMouseState(_mouse.getState()));
 	}
 
 	// Private

msu/systems/mod_settings/elements/keybind_setting.nut

@@ -1,4 +1,12 @@
 ::MSU.Class.KeybindSetting <- class extends ::MSU.Class.StringSetting
 {
 	static Type = "Keybind";
+
+	// Temporary to fix savegames
+	// TODO Remove with 1.3.0
+	function __setFromSerializationTable( _table )
+	{
+		_table.Value = ::String.replace(_table.Value, "tabulator", "tab");
+		base.__setFromSerializationTable(_table);
+	}
 }

msu/systems/serialization/load.nut

@@ -10,3 +10,22 @@ includeFile("deserialization_emulator");
 includeFile("serialization_system.nut");
 ::MSU.System.Serialization <- ::MSU.Class.SerializationSystem();
 includeFile("serialization_mod_addon.nut");
+
+::MSU.UI.addOnConnectCallback(function()
+{
+	local worldState = ::new("scripts/states/world_state");
+	local serEm = ::MSU.Class.SerializationEmulator(::MSU.ID, "WorldStateOnBeforeSerialize", ::new("scripts/tools/tag_collection"), ::MSU.Class.MetaDataEmulator());
+	::MSU.System.Serialization.MetaData = serEm.getMetaData();
+	::World.Assets <- {
+		getName = @() "msuDummy",
+		getBanner = @() "msuDummy",
+		getCombatDifficulty = @() 1,
+		getEconomicDifficulty = @() 1,
+		isIronman = @() false,
+	}
+	::World.Assets.setdelegate({ // attempted patch for any other function calls
+		_get = @(_k)@(...)""
+	});
+	worldState.onBeforeSerialize(serEm);
+	delete ::World.Assets;
+});

msu/systems/serialization/metadata_emulator.nut

@@ -86,4 +86,10 @@
 	{
 		return "";
 	}
+
+	function _cloned( _original )
+	{
+		this.Data = clone _original.Data;
+		this.Version = _original.Version;
+	}
 }

msu/systems/serialization/serde_emulator.nut

@@ -10,7 +10,7 @@
 
 	constructor(_mod, _id, _flagContainer, _metaDataEmulator = null)
 	{
-		if (_metaDataEmulator == null) _metaDataEmulator = ::MSU.Class.MetaDataEmulator();
+		if (_metaDataEmulator == null) _metaDataEmulator = clone ::MSU.System.Serialization.MetaData;
 		if (this.__IDRegex.match(_id))
 		{
 			::logError("the ID passed to flag serialization cannot end with a full stop followed by digits so it doesn't collide with internal MSU flags");

msu/systems/serialization/serialization_system.nut

@@ -2,6 +2,7 @@
 {
 	Mods = null;
 	EmulatorsToClear = null;
+	MetaData = null;
 
 	constructor()
 	{

scripts/config/!msu.nut

@@ -1,5 +1,5 @@
 ::MSU <- {
-	Version = "1.2.2",
+	Version = "1.2.7",
 	ID = "mod_msu",
 	Name = "Modding Standards & Utilities (MSU)",
 	VanillaID = "vanilla",

ui/mods/msu/keybinds/key_static.js

@@ -30,7 +30,7 @@ MSU.Key = {
 	},
 	KeyMapJS : {
 		8 :"backspace",
-		9 :"tabulator",
+		9 :"tab",
 		13 :"return",
 		16 :"shift",
 		17 :"ctrl",