sight/detection/aggro ranges; better configurable victory conditions

Author: malytomas

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 = 47;
+	static const uint32 UW_VERSION = 48;
 	static const uint32 UW_GameTicksPerSecond = 20;
 
 	typedef struct UwIds

c/uwapi/uwapi/modules/scriptsServer.h

@@ -58,7 +58,7 @@ extern "C"
 	UNNATURAL_API float uwCutsceneTime(void); // seconds since start of the cutscene
 	UNNATURAL_ENTRY void uwCutsceneSkipCallback(void);
 
-	UNNATURAL_API void uwStandardVictoryConditions(bool enable);
+	UNNATURAL_API void uwStandardVictoryConditions(bool viteals, bool rivalries);
 	UNNATURAL_API void uwSendChatEveryone(const char *msg);
 	UNNATURAL_API void uwSendChatOne(const char *msg, uint32 targetId);
 	UNNATURAL_API void uwSendChatDirect(const char *msg, const uint32 targetsIds[], const uint32 targetsCount);

csharp/uwapi/interop.cs

@@ -327,7 +327,7 @@ public static extern void uwCommandPlaceConstruction(uint constructionProto, uin
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void uwCommandSelfDestruct(uint entityId);
 
-        public const uint UW_VERSION = 47;
+        public const uint UW_VERSION = 48;
         public const uint UW_GameTicksPerSecond = 20;
         [StructLayout(LayoutKind.Sequential)]
         public struct UwIds

csharp/uwapi/prototypes.cs

@@ -53,19 +53,24 @@ public class ProtoUnit : ProtoCommon
         public bool logistics; // vehicle that is automatically controlled by the logistics system
         public bool assembler; // the unit must have at least one valid recipe
         public bool emptyNeighbors; // the building requires empty space around
+        public bool detector; // this units can detect units in its sight range irrespective of their detection range
         public bool maximumDistance; // the unit moves to maximum distance when shooting
-        public bool excludeFromMilitary; // the unit is excluded from all-army hotkey
         public bool neutralCategory; // the unit is put in neutral category in lexicon
+        public bool excludeFromMilitary; // the unit is excluded from all-army hotkey
         public bool explodesWhenAttacks; // suicidal unit
         public bool explodesWhenKilled;
         public bool explodesWhenSelfDestructed;
         public float processingSpeed;
+        public float sightRange;
+        public float detectionRange;// range at which this unit is always detected
+        public float aggroRange;
         public float lifeRegen; // life per second
         public float manaRegen; // mana per second
         public uint maxLife;
         public uint maxMana;
         public uint startingMana;
-        public uint regenDelay; // ticks
+        public uint regenDelay; // ticks out of combat before regen applies (affects both life and mana)
+        public uint score;
         public uint armorType;
         public string armorTypeName;
 

python/uwapi/bots.h

@@ -9,7 +9,7 @@ typedef int32_t sint32;
 typedef uint64_t uint64;
 typedef int64_t sint64;
 
-static const uint32 UW_VERSION = 47;
+static const uint32 UW_VERSION = 48;
 static const uint32 UW_GameTicksPerSecond = 20;
 
 typedef struct UwIds