ping, ai config, mana, regen; pathfinding docs

Author: malytomas

c/uwapi/uwapi/modules/botsAdmin.h

@@ -29,6 +29,7 @@ extern "C"
 	UNNATURAL_API void uwAdminSendSuggestedCameraFocus(uint32 position);
 	UNNATURAL_API void uwAdminSetAutomaticSuggestedCameraFocus(bool enabled);
 	UNNATURAL_API void uwAdminSendChat(const char *msg, UwChatTargetFlags flags, uint32 targetId);
+	UNNATURAL_API void uwAdminSendPing(uint32 position, UwPingEnum ping, uint32 targetForce);
 
 #endif
 

c/uwapi/uwapi/modules/common.h

@@ -34,7 +34,7 @@ extern "C"
 	typedef uint64_t uint64;
 	typedef int64_t sint64;
 
-	static const uint32 UW_VERSION = 35;
+	static const uint32 UW_VERSION = 36;
 	static const uint32 UW_GameTicksPerSecond = 20;
 
 	typedef struct UwIds
@@ -50,6 +50,17 @@ extern "C"
 		UwPriorityEnum_High = 2,
 	} UwPriorityEnum;
 
+	typedef enum UwPingEnum
+	{
+		UwPingEnum_None = 0,
+		UwPingEnum_Attention = 1,
+		UwPingEnum_Attack = 2,
+		UwPingEnum_Defend = 3,
+		UwPingEnum_Rally = 4,
+		UwPingEnum_Build = 5,
+		UwPingEnum_Evacuate = 6,
+	} UwPingEnum;
+
 	typedef enum UwPathStateEnum
 	{
 		UwPathStateEnum_None = 0,

c/uwapi/uwapi/modules/components.h

@@ -52,10 +52,11 @@ extern "C"
 	typedef enum UwUnitStateFlags
 	{
 		UwUnitStateFlags_None = 0,
-		UwUnitStateFlags_Shooting = 1 << 0,
+		UwUnitStateFlags_Shooting = 1 << 0, // reloading
 		UwUnitStateFlags_Processing = 1 << 1, // processing recipe
 		UwUnitStateFlags_Rebuilding = 1 << 2, // changing recipe
 		UwUnitStateFlags_Stalling = 1 << 3, // usually due to maximumProcessingOutput
+		UwUnitStateFlags_Damaged = 1 << 4, // less than half life
 	} UwUnitStateFlags;
 	typedef struct UwUnitComponent
 	{
@@ -70,6 +71,12 @@ extern "C"
 	} UwLifeComponent;
 	UNNATURAL_API bool uwFetchLifeComponent(UwEntityPtr entity, UwLifeComponent *data);
 
+	typedef struct UwManaComponent
+	{
+		sint32 mana;
+	} UwManaComponent;
+	UNNATURAL_API bool uwFetchManaComponent(UwEntityPtr entity, UwManaComponent *data);
+
 	typedef struct UwMoveComponent
 	{
 		uint32 posStart;
@@ -93,19 +100,19 @@ extern "C"
 	} UwRecipeComponent;
 	UNNATURAL_API bool uwFetchRecipeComponent(UwEntityPtr entity, UwRecipeComponent *data);
 
-	typedef struct UwUpdateTimestampComponent
-	{
-		uint32 timestamp;
-	} UwUpdateTimestampComponent;
-	UNNATURAL_API bool uwFetchUpdateTimestampComponent(UwEntityPtr entity, UwUpdateTimestampComponent *data);
-
 	typedef struct UwRecipeStatisticsComponent
 	{
 		uint32 timestamps[3];
 		uint32 completed;
 	} UwRecipeStatisticsComponent;
 	UNNATURAL_API bool uwFetchRecipeStatisticsComponent(UwEntityPtr entity, UwRecipeStatisticsComponent *data);
 
+	typedef struct UwLogisticsTimestampComponent
+	{
+		uint32 timestamp;
+	} UwLogisticsTimestampComponent;
+	UNNATURAL_API bool uwFetchLogisticsTimestampComponent(UwEntityPtr entity, UwLogisticsTimestampComponent *data);
+
 	typedef struct UwPriorityComponent
 	{
 		UwPriorityEnum priority;
@@ -124,6 +131,12 @@ extern "C"
 	} UwAttachmentComponent;
 	UNNATURAL_API bool uwFetchAttachmentComponent(UwEntityPtr entity, UwAttachmentComponent *data);
 
+	typedef struct UwPingComponent
+	{
+		UwPingEnum ping;
+	} UwPingComponent;
+	UNNATURAL_API bool uwFetchPingComponent(UwEntityPtr entity, UwPingComponent *data);
+
 	typedef enum UwPlayerStateFlags
 	{
 		UwPlayerStateFlags_None = 0,
@@ -153,6 +166,15 @@ extern "C"
 	} UwPlayerComponent;
 	UNNATURAL_API bool uwFetchPlayerComponent(UwEntityPtr entity, UwPlayerComponent *data);
 
+	typedef struct UwPlayerAiConfigComponent
+	{
+		float dumbness;
+		float aggressive; // army is frequently attacking, or mostly just defends
+		float stretched; // army is spread into many small groups, or mostly concentrated
+		float expansive; // takes many bases, or turtles on few
+	} UwPlayerAiConfigComponent;
+	UNNATURAL_API bool uwFetchPlayerAiConfigComponent(UwEntityPtr entity, UwPlayerAiConfigComponent *data);
+
 	typedef enum UwForceStateFlags
 	{
 		UwForceStateFlags_None = 0,

c/uwapi/uwapi/modules/scriptsServer.h

@@ -19,29 +19,38 @@ extern "C"
 	UNNATURAL_API void uwSetPosition(uint32 entity, uint32 position);
 	UNNATURAL_API void uwSetYaw(uint32 entity, float yaw);
 	UNNATURAL_API void uwMove(uint32 entity, uint32 position); // neighbor only
-	UNNATURAL_API void uwMoveYaw(uint32 entity, uint32 position, float yaw);
-	UNNATURAL_API void uwMoveTo(uint32 entity, uint32 position);
+	UNNATURAL_API void uwMoveYaw(uint32 entity, uint32 position, float yaw); // neighbor only
+	UNNATURAL_API void uwMoveTowards(uint32 entity, uint32 position); // performs serves-side pathfinding - use with care
 
 	UNNATURAL_API void uwSetLife(uint32 entity, uint32 life);
+	UNNATURAL_API void uwSetMana(uint32 entity, uint32 mana);
 	UNNATURAL_API void uwSetAim(uint32 entity, uint32 target); // target = 0 to remove
 	UNNATURAL_API void uwSetRecipe(uint32 entity, uint32 recipe); // recipe = 0 to remove
 	UNNATURAL_API void uwSetPriority(uint32 entity, UwPriorityEnum priority);
-	UNNATURAL_API void uwSetCooldown(uint32 entity, uint32 ticks);
+	UNNATURAL_API void uwSetShootingCooldown(uint32 entity, uint32 ticks); // ticks = 0 to remove cooldown
+	UNNATURAL_API void uwSetRegenCooldown(uint32 entity, uint32 ticks); // ticks = 0 to remove cooldown
+	UNNATURAL_API void uwSetProcessingCooldown(uint32 entity, uint32 ticks); // ticks = 0 to remove cooldown
+	UNNATURAL_API void uwSetDecay(uint32 entity, uint32 ticks); // ticks = -1 to remove decay
 
 	UNNATURAL_API void uwSetAmount(uint32 entity, uint32 amount);
 	UNNATURAL_API void uwSetAttached(uint32 entity, uint32 target); // target = 0 to detach
 
 	UNNATURAL_API uint32 uwCreateForce(void);
 	UNNATURAL_API void uwDestroyForce(uint32 force);
-	UNNATURAL_API void uwSetPlayerForce(uint32 player, uint32 force);
 	UNNATURAL_API void uwSetForceColor(uint32 force, float r, float g, float b);
 	UNNATURAL_API void uwSetForceFinish(uint32 force, bool winner, bool defeated);
 	UNNATURAL_API void uwSetForceStartingTeam(uint32 force, uint32 team);
 	UNNATURAL_API void uwSetForceStartingPosition(uint32 force, uint32 position);
 	UNNATURAL_API void uwSetForeignPolicy(uint32 force1, uint32 force2, UwForeignPolicyEnum policy);
 
+	UNNATURAL_API uint32 uwCreateAiPlayer(void);
+	// UNNATURAL_API void uwDestroyAiPlayer(uint32 player);
+	UNNATURAL_API void uwSetPlayerAiConfig(uint32 player, const UwPlayerAiConfigComponent *config);
+	UNNATURAL_API void uwSetPlayerForce(uint32 player, uint32 force);
+
 	UNNATURAL_API void uwStandardVictoryConditions(bool enable);
-	UNNATURAL_API void uwSendChat(const char *msg, UwChatTargetFlags flags, uint32 target);
+	UNNATURAL_API void uwSendChat(const char *msg, UwChatTargetFlags flags, uint32 targetId);
+	UNNATURAL_API void uwSendPing(uint32 position, UwPingEnum ping, uint32 targetForce);
 
 	UNNATURAL_API void uwPrint(const char *msg);
 	UNNATURAL_API uint32 uwRand(void);

c/uwapi/uwapi/modules/world.h

@@ -27,7 +27,9 @@ extern "C"
 	{
 		float damage;
 		float shootingRange;
+		float splashRadius;
 		float defense;
+		float regenSpeed;
 		float movementSpeed;
 		float processingSpeed;
 	} UwUnitUpgrades;

c/uwapi/uwapi/scripts.hpp

@@ -2,6 +2,7 @@
 #define unnatural_uwapi_scripts_hpp_zhgfa8g4
 
 #include <vector>
+#include <cstring> // memcpy
 
 #include "scripts.h"
 
@@ -12,12 +13,12 @@ namespace uw
 	{
 		std::vector<std::remove_cv_t<T>> res;
 		res.resize(cnt);
-		memcpy(res.data(), data, cnt * sizeof(T));
+		std::memcpy(res.data(), data, cnt * sizeof(T));
 		return res;
 	}
 
 	template<class S>
-	requires(requires { S::data; })
+		requires(requires { S::data; })
 	auto makeVector(const S *src)
 	{
 		return makeVector(src->data, src->count);

csharp/uwapi/admin.cs

@@ -1,6 +1,7 @@
 namespace Unnatural
 {
     using ChatTargetFLags = Interop.UwChatTargetFlags;
+    using PingEnum = Interop.UwPingEnum;
 
     public static class Admin
     {
@@ -98,5 +99,10 @@ public static void SendChat(string msg, ChatTargetFLags flags, uint id = uint.Ma
         {
             Interop.uwAdminSendChat(msg, flags, id);
         }
+
+        public static void SendPing(uint position, PingEnum ping, uint id)
+        {
+            Interop.uwAdminSendPing(position, ping, id);
+        }
     }
 }