Merge branch 'development' into radius-affecting-attachables

Author: Causeless

CHANGELOG.md

@@ -60,12 +60,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New hotkey system for `Actor` and `HeldDevice`.
 	Pressing a certain new hotkey will mark it as activated on `Actor` and `HeldDevice`, letting scripts make use of the new bindings easily.
-	`Enum` binding for `HeldDevice.HeldDeviceHotkeyType`: `PRIMARY = 0, AUXILIARY = 1, HELDDEVICEHOTKEYTYPECOUNT = 2`.  
-	`Enum` binding for `Actor.ActorHotkeyType`: `PRIMARY = 0, AUXILIARY = 1, ACTORHOTKEYTYPECOUNT = 2`. 
+	`Enum` binding for `HeldDevice.HeldDeviceHotkeyType`: `PRIMARYHOTKEY = 0, AUXILIARYHOTKEY = 1, HELDDEVICEHOTKEYTYPECOUNT = 2`.  
+	`Enum` binding for `Actor.ActorHotkeyType`: `PRIMARYHOTKEY = 0, AUXILIARYHOTKEY = 1, ACTORHOTKEYTYPECOUNT = 2`. 
 	Both `Actor` and `HeldDevice` have the following functions:
 	`HotkeyActionIsActivated(hotkeyType)` returns whether a certain hotkey action is being activated or not.
 	`ActivateHotkeyAction(hotkeyType)` activates a certain hotkey action.
 	`DeactivateHotkeyAction(hotkeyType)` deactivates a certain hotkey action.
+	
+- New `Controller` state `WEAPON_RELOADHELD`, which is true every frame reload input is held (as opposed to `WEAPON_RELOAD` which is only true once when pressed).
 
 - New `GAScripted` Lua script method `IsCompatibleScene(scene)` to allow Activities to generically decide which Scenes are eligible by returning a boolean value.
 	New `GAScripted` INI enumerating property `AddRequiredArea`, replacing Lua file scanning, to allow Activities to explicitly state which areas are strictly required.
@@ -81,8 +83,28 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `Attachable` INI and Lua (R/W) properties `InheritsVelWhenDetached` and `InheritsAngularVelWhenDetached`, which determine how much of these velocities an attachable inherits from its parent when detached. Defaults to 1.
 
+- Added Lua-accessible bitmap manipulation functions to `MOSprite`s:	
+	```
+	GetSpritePixelIndex(int x, int y, int whichFrame) - Returns the color index of the pixel at the given coordinate on the given frame of the sprite ((0, 0) is the upper left corner!)
+
+	SetSpritePixelIndex(int x, int y, int whichFrame, int colorIndex, int ignoreIndex, bool invert) - Sets the color of the pixel at the given coordinate on the given frame of the sprite, skipping if the pixel has same color index as given in "ignoreIndex". If "invert" is set to true, only pixels of that color index are set.
+
+	GetAllSpritePixelPositions(const Vector& origin, float angle, bool hflipped, int whichFrame, int ignoreIndex, bool invert, bool includeChildren) - Returns a list of vectors pointing to the absolute positions of all pixels in the given frame of the sprite, rotated to match "angle", flipped to match "hflipped" and positioned around "origin", providing a full silhouette of the MOSprite. "IgnoreIndex" and "invert" are like above, "includeChildren" denotes whether or not to include all children of the MOSprite (no effect if not at least an MOSRotating).
+
+	GetAllVisibleSpritePixelPositions(bool includeChildren) - Simplified version of the above, returning a list of absolute positions of the visible pixels of the current frame of the sprite as it is currently drawn.
+
+	SetAllSpritePixelIndexes(int whichFrame, int colorIndex, int ignoreIndex, bool invert) - Sets all pixels in the given frame of the sprite to the given color index, ignoring and inverting as above.
+ 
+	SetAllVisibleSpritePixelIndexes(int colorIndex) - Simplified version of the above, sets all visible pixels of the currently visible sprite to the given color index.
+	```
+- Added `Material` Lua function `GetColorIndex()`, which returns the color index of the calling material.
+
 - New `ACraft` INI and Lua (R/W) property `CanEnterOrbit`, which determines whether a craft can enter orbit (and refund gold appropriately) or not. If false, default out-of-bounds deletion logic applies.
 
+- New `MovableMan` function `GetMOsAtPosition(posX, posY, ignoreTeam, getsHitByMOsOnly)` that will return an iterator with all the `MovableObject`s that intersect that exact position with their sprite.
+
+- New `SceneMan` function `CastAllMOsRay(startVector, rayVector, table ignoreMOIDs, ignoreTeam, ignoreMaterial, bool ignoreAllTerrain, int skip)` which returns an iterator with pointers to all the non-ignored MOs met along the ray.
+
 </details>
 
 <details><summary><b>Changed</b></summary>
@@ -127,6 +149,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - `Scene` Lua functions `AddNavigatableArea(areaName)` and `ClearNavigatableAreas()` have been renamed/corrected to `AddNavigableArea(areaName)` and `ClearNavigableAreas()`, respectively.
 
+- `MOSRotating` Lua function `AddWound` now additionally accepts the format `MOSRotating:AddWound(AEmitter* woundToAdd, const Vector& parentOffsetToSet, bool checkGibWoundLimit, bool isEntryWound, bool isExitWound)`, allowing modders to specify added wounds as entry- or exit wounds, for the purpose of not playing multiple burst sounds on the same frame. These new arguments are optional.
+
+- `SceneMan` function `CastFindMORay` now has an extra bool parameter `findChildMOIDs` that denotes whether it also triggers on child MOIDs or not, which defaults to true for the same default behavior as before.
+
+- `SceneMan` function `CastMORay` now can also accept a table of MOIDs instead of a single MOID, letting you ignore any arbitrary set of MOIDs.
+
+- Techion Laser Rifle now has a constant range rather than being dependent on game resolution.
+
+- Various performance improvements.
+
 </details>
 
 <details><summary><b>Fixed</b></summary>
@@ -147,6 +179,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed an issue where internal Lua functions OriginalDoFile, OriginalLoadFile, and OriginalRequire were polluting the global namespace. They have now been made inaccessible.
 
+- Fixed `MOSprite:UnRotateOffset()` giving the wrong results on HFLipped sprites.
+
+- Various fixes and improvements to inventory management when dual-wielding or carrying a shield, to stop situations where the actor unexpectedly puts their items away.
+
+- Fixed issue where MOSR `Gib`s, `AEmitter` or `PEmitter` `Emission`s, and MetaMan `Player`s were not correctly accessible from script.
+
+- Fixed a crash on launch when the `SupportedGameVersion` INI property was not set.
+
+- Fixed several issues with the way pie menus and aiming interacts between players, such as opening the pie menu always resetting the M&KB player's aim and pie selection, as well as another issue where the pie menu would fail to appear entirely for some players.
+
+- Fixed issue where scripts applied to `MovableObject`s could become disordered in certain circumstances.
+
 </details>
 
 <details><summary><b>Removed</b></summary>
@@ -2677,7 +2721,7 @@ This can be accessed via the new Lua (R/W) `SettingsMan` property `AIUpdateInter
 
 - `TDExplosive.ActivatesWhenReleased` now works properly.
 
-- Various bug fixed related to all the Attachable and Emitter changes, so they can now me affected reliably and safely with lua.
+- Various bugs fixed related to all the Attachable and Emitter changes, so they can again be affected reliably and safely with lua.
 
 - Various minor other things that have gotten lost in the shuffle.
 

Data/Base.rte/AI/SharedBehaviors.lua

@@ -259,7 +259,7 @@ function SharedBehaviors.Patrol(AI, Owner, Abort)
 
 	if Dist:MagnitudeIsGreaterThan(20) then
 		Owner:ClearAIWaypoints();
-		Owner:AddAISceneWaypoint(Free);	
+		Owner:AddAISceneWaypoint(Free);
 		Owner:UpdateMovePath();
 
 		-- wait until movepath is updated
@@ -434,7 +434,7 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 	local obstacleState = Actor.PROCEEDING;
 	local Obst = {R_LOW = 1, R_FRONT = 2, R_HIGH = 3, R_UP = 5, L_UP = 6, L_HIGH = 8, L_FRONT = 9, L_LOW = 10};
 	local Facings = {{aim=0, facing=0}, {aim=1.4, facing=1.4}, {aim=1.4, facing=math.pi-1.4}, {aim=0, facing=math.pi}};
-	
+
 	local NeedsNewPath, Waypoint, HasMovePath, Dist, CurrDist;
 	NeedsNewPath = true;
 
@@ -518,7 +518,7 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 		end
 
 		AverageVel = SharedBehaviors.UpdateAverageVel(Owner, AverageVel);
-		
+
 		local stuckThreshold = 2.5; -- pixels per second of movement we need to be considered not stuck
 
 		-- Cap AverageVel, so if we have a spike in velocity it doesn't take too long to come back down
@@ -1089,7 +1089,7 @@ function SharedBehaviors.GetProjectileData(Owner)
 		PrjDat.vqu = PrjDat.vsq^2; -- muzzle velocity quad
 		PrjDat.drg = 1 - Projectile.AirResistance * TimerMan.DeltaTimeSecs; -- AirResistance is stored as the ini-value times 60
 		PrjDat.thr = math.min(Projectile.AirThreshold, PrjDat.vel);
-		PrjDat.pen = (Projectile.Mass * Projectile.Sharpness * PrjDat.vel) * PrjDat.drg;
+		PrjDat.pen = Weapon:GetAIPenetration() * PrjDat.drg;
 
 		PrjDat.blast = Weapon:GetAIBlastRadius();
 		if PrjDat.blast > 0 or Weapon:IsInGroup("Weapons - Explosive") then

Data/Base.rte/Actors/Mecha/AADrone/Drone.ini

@@ -85,8 +85,21 @@ AddDevice = HDFirearm
 	Flash = Attachable
 		CopyOf = Muzzle Flash SMG
 	FireSound = SoundContainer
-		AddSound = ContentFile
-			FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Fire1.flac
+		AttenuationStartDistance = 165
+		SoundSelectionCycleMode = All
+		AddSoundSet = SoundSet		
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot1.flac
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot2.flac
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot3.flac
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot4.flac
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot5.flac
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot6.flac
 	EmptySound = SoundContainer
 		AddSound = ContentFile
 			FilePath = Base.rte/Sounds/Devices/EmptyClick1.flac

Data/Base.rte/Devices/Shared/Scripts/MuzzleSmoke.lua

@@ -1,5 +1,4 @@
 function Create(self)
-
 	if self.Magazine then
 		local particleCount = self.Magazine.NextRound.ParticleCount;
 		local particleMass = self.Magazine.NextRound.NextParticle.Mass;
@@ -30,16 +29,13 @@ function Create(self)
 	self.fireSmokeEffect.GravMult = 1;
 
 	self.particleUtility = require("Scripts/Utility/ParticleUtility");	
-	
 end
 
 function OnFire(self)
-
 	local flip = self.HFlipped and math.pi or 0;
 	local angle = self.RotAngle + flip;
 	self.fireSmokeEffect.Position = self.MuzzlePos;
 	self.fireSmokeEffect.RadAngle = angle;
 
 	self.particleUtility:CreateDirectionalSmokeEffect(self.fireSmokeEffect);
-
 end

Data/Base.rte/Devices/Shared/Scripts/RevolverCylinderReload.lua

@@ -4,18 +4,29 @@ function Create(self)
 	self.shellMOSRotating = self:StringValueExists("CylinderShellMOSRotating") and self:GetStringValue("CylinderShellMOSRotating") or nil;
 end
 
-function Update(self)
+function ThreadedUpdate(self)
 	if self.Magazine then
 		self.shellsToEject = self.Magazine.Capacity - self.Magazine.RoundCount;
 	elseif self.shellsToEject > 0 then
+		self.ejectingShells = {};
 		for i = 1, self.shellsToEject do
 			local shell = self.shellMOSRotating and CreateMOSRotating(self.shellMOSRotating) or CreateMOSParticle(self.shellMOSParticle);
 			shell.Pos = self.Pos;
 			shell.Vel = self.Vel + Vector(RangeRand(-3, 0) * self.FlipFactor, 0):RadRotate(self.RotAngle + RangeRand(-0.3, 0.3));
 			shell.AngularVel = RangeRand(-1, 1);
-			MovableMan:AddParticle(shell);
+			table.insert(self.ejectingShells, shell);
 		end
 
 		self.shellsToEject = 0;
+		self:RequestSyncedUpdate();
+	end
+end
+
+function SyncedUpdate(self)
+	if self.ejectingShells then
+		for i = 1, #self.ejectingShells do 
+			MovableMan:AddParticle(self.ejectingShells[i]);
+		end
+		self.ejectingShells = nil;
 	end
 end