Add ship log function from lua

scripts/api/entity/playerspaceship.lua

@@ -49,7 +49,7 @@ end
 --- Takes a string as the message and a color applied to the logged message.
 --- Example: player:addToShipLog("Acknowledged","yellow") -- adds "Acknowledged" in yellow to the `player` ship's log
 function Entity:addToShipLog(message, color)
-    --TODO
+    addEntryToShipsLog(self, message, color)
 end
 --- Moves all players connected to this ship to the same crew positions on another PlayerSpaceship.
 --- If the target isn't a PlayerSpaceship, this function has no effect.

src/script.cpp

@@ -30,6 +30,7 @@
 #include "components/beamweapon.h"
 #include "components/internalrooms.h"
 #include "components/zone.h"
+#include "components/shiplog.h"
 #include "components/selfdestruct.h"
 #include "systems/jumpsystem.h"
 #include "systems/missilesystem.h"
@@ -477,6 +478,12 @@ void luaRemovePlayerShipCustomFunction(sp::ecs::Entity entity, string name)
     }
 }
 
+void luaAddEntryToShipsLog(sp::ecs::Entity entity, string entry, glm::u8vec4 color)
+{
+    auto sl = entity.getComponent<ShipLog>();
+    if (!sl) return;
+    sl->add(entry, color);
+}
 
 
 static sp::ecs::Entity luaGetPlayerShip(int index)
@@ -1204,6 +1211,7 @@ bool setupScriptEnvironment(sp::script::Environment& env)
     env.setGlobal("hasPlayerCrewAtPosition", &luaHasPlayerAtPosition);
     env.setGlobal("setPlayerShipCustomFunction", &luaSetPlayerShipCustomFunction);
     env.setGlobal("removePlayerShipCustomFunction", &luaRemovePlayerShipCustomFunction);
+    env.setGlobal("addEntryToShipsLog", &luaAddEntryToShipsLog);
 
     /// EScanningComplexity getScanningComplexity()
     /// Returns the running scenario's scanning complexity setting.

src/script/vector.h

@@ -69,7 +69,33 @@ template<> struct Convert<glm::u8vec4> {
     }
     static glm::u8vec4 fromLua(lua_State* L, int idx) {
         glm::u8vec4 result{};
-        if (lua_isinteger(L, idx)) {
+        if (lua_isstring(L, idx)) {
+            result = glm::u8vec4(255,255,255,255);
+            string str = string(lua_tostring(L, idx)).lower();
+            if (str == "black") { result = glm::u8vec4(0,0,0,255); return result; }
+            else if (str == "white") { result = glm::u8vec4(255,255,255,255); return result; }
+            else if (str == "red") { result = glm::u8vec4(255,0,0,255); return result; }
+            else if (str == "green") { result = glm::u8vec4(0,255,0,255); return result; }
+            else if (str == "blue") { result = glm::u8vec4(0,0,255,255); return result; }
+            else if (str == "yellow") { result = glm::u8vec4(255,255,0,255); return result; }
+            else if (str == "magenta") { result = glm::u8vec4(255,0,255,255); return result; }
+            else if (str == "cyan") { result = glm::u8vec4(0,255,255,255); return result; }
+
+            if (str.startswith("#") && str.length() == 7)
+            {
+                result.r = static_cast<uint8_t>(str.substr(1, 2).toInt(16));
+                result.g = static_cast<uint8_t>(str.substr(3, 2).toInt(16));
+                result.b = static_cast<uint8_t>(str.substr(5, 2).toInt(16));
+            } else {
+                std::vector<string> parts = str.split(",");
+                if (parts.size() == 3)
+                {
+                    result.r = static_cast<uint8_t>(parts[0].toInt());
+                    result.g = static_cast<uint8_t>(parts[1].toInt());
+                    result.b = static_cast<uint8_t>(parts[2].toInt());
+                }
+            }
+        } else if (lua_isinteger(L, idx)) {
             int n = lua_tointeger(L, idx);
             result.r = float(n & 0xFF) / 255.0f;
             result.g = float((n >> 8) & 0xFF) / 255.0f;