Bump protocol version

[minetest.git] / src / network / networkprotocol.h

diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
index a5ff532166edd2aaa46149c36a5b0f1dab75e9a1..3ab839f8dc5527f486a9a5d7aef09acfde39a094 100644 (file)
--- a/src/network/networkprotocol.h
+++ b/src/network/networkprotocol.h
@@ -207,9 +207,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                Minimap modes
        PROTOCOL VERSION 40:
                TOCLIENT_MEDIA_PUSH changed, TOSERVER_HAVE_MEDIA added
+               Added new particlespawner parameters
+               [scheduled bump for 5.6.0]
 */
 
-#define LATEST_PROTOCOL_VERSION 40
+#define LATEST_PROTOCOL_VERSION 41
 #define LATEST_PROTOCOL_VERSION_STRING TOSTRING(LATEST_PROTOCOL_VERSION)
 
 // Server's supported network protocol range
@@ -228,8 +230,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define PASSWORD_SIZE 28       // Maximum password length. Allows for
                                // base64-encoded SHA-1 (27+\0).
 
-// See also: Formspec Version History in doc/lua_api.txt
-#define FORMSPEC_API_VERSION 5
+// See also formspec [Version History] in doc/lua_api.txt
+#define FORMSPEC_API_VERSION 6
 
 #define TEXTURENAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.-"
 
@@ -511,11 +513,12 @@ enum ToClientCommand
 
        TOCLIENT_SPAWN_PARTICLE = 0x46,
        /*
-               v3f1000 pos
-               v3f1000 velocity
-               v3f1000 acceleration
-               f1000 expirationtime
-               f1000 size
+               -- struct range<T> { T min, T max, f32 bias };
+               v3f pos
+               v3f velocity
+               v3f acceleration
+               f32 expirationtime
+               f32 size
                u8 bool collisiondetection
                u32 len
                u8[len] texture
@@ -524,22 +527,26 @@ enum ToClientCommand
                TileAnimation animation
                u8 glow
                u8 object_collision
+               v3f drag
+               range<v3f> bounce
        */
 
        TOCLIENT_ADD_PARTICLESPAWNER = 0x47,
        /*
+               -- struct range<T> { T min, T max, f32 bias };
+               -- struct tween<T> { T start, T end };
                u16 amount
-               f1000 spawntime
-               v3f1000 minpos
-               v3f1000 maxpos
-               v3f1000 minvel
-               v3f1000 maxvel
-               v3f1000 minacc
-               v3f1000 maxacc
-               f1000 minexptime
-               f1000 maxexptime
-               f1000 minsize
-               f1000 maxsize
+               f32 spawntime
+               v3f minpos
+               v3f maxpos
+               v3f minvel
+               v3f maxvel
+               v3f minacc
+               v3f maxacc
+               f32 minexptime
+               f32 maxexptime
+               f32 minsize
+               f32 maxsize
                u8 bool collisiondetection
                u32 len
                u8[len] texture
@@ -549,6 +556,63 @@ enum ToClientCommand
                TileAnimation animation
                u8 glow
                u8 object_collision
+
+               f32 pos_start_bias
+               f32 vel_start_bias
+               f32 acc_start_bias
+               f32 exptime_start_bias
+               f32 size_start_bias
+
+               range<v3f> pos_end
+               -- i.e v3f pos_end_min
+               --     v3f pos_end_max
+               --     f32 pos_end_bias
+               range<v3f> vel_end
+               range<v3f> acc_end
+
+               tween<range<v3f>> drag
+               -- i.e. v3f drag_start_min
+               --      v3f drag_start_max
+               --      f32 drag_start_bias
+               --      v3f drag_end_min
+               --      v3f drag_end_max
+               --      f32 drag_end_bias
+               tween<range<v3f>> jitter
+               tween<range<f32>> bounce
+
+               u8 attraction_kind
+                       none  = 0
+                       point = 1
+                       line  = 2
+                       plane = 3
+
+               if attraction_kind > none {
+                       tween<range<f32>> attract_strength
+                       tween<v3f>        attractor_origin
+                       u16               attractor_origin_attachment_object_id
+                       u8                spawner_flags
+                           bit 1: attractor_kill (particles dies on contact)
+                       if attraction_mode > point {
+                               tween<v3f> attractor_angle
+                               u16        attractor_origin_attachment_object_id
+                       }
+               }
+
+               tween<range<v3f>> radius
+               tween<range<v3f>> drag
+
+               u16 texpool_sz
+               texpool_sz.times {
+                       u8 flags
+                       -- bit 0: animated
+                       -- other bits free & ignored as of proto v40
+                       tween<f32> alpha
+                       tween<v2f> scale
+                       if flags.animated {
+                               TileAnimation animation
+                       }
+               }
+
        */
 
        TOCLIENT_DELETE_PARTICLESPAWNER_LEGACY = 0x48, // Obsolete
@@ -735,6 +799,7 @@ enum ToClientCommand
                u32 count
                u8[4] starcolor (ARGB)
                f32 scale
+               f32 day_opacity
        */
 
        TOCLIENT_SRP_BYTES_S_B = 0x60,
@@ -762,7 +827,12 @@ enum ToClientCommand
                        std::string extra
        */
 
-       TOCLIENT_NUM_MSG_TYPES = 0x63,
+       TOCLIENT_SET_LIGHTING = 0x63,
+       /*
+               f32 shadow_intensity
+       */
+
+       TOCLIENT_NUM_MSG_TYPES = 0x64,
 };
 
 enum ToServerCommand
@@ -1001,7 +1071,7 @@ enum AuthMechanism
        AUTH_MECHANISM_FIRST_SRP = 1 << 2,
 };
 
-enum AccessDeniedCode {
+enum AccessDeniedCode : u8 {
        SERVER_ACCESSDENIED_WRONG_PASSWORD,
        SERVER_ACCESSDENIED_UNEXPECTED_DATA,
        SERVER_ACCESSDENIED_SINGLEPLAYER,
@@ -1024,18 +1094,18 @@ enum NetProtoCompressionMode {
 
 const static std::string accessDeniedStrings[SERVER_ACCESSDENIED_MAX] = {
        "Invalid password",
-       "Your client sent something the server didn't expect.  Try reconnecting or updating your client",
+       "Your client sent something the server didn't expect.  Try reconnecting or updating your client.",
        "The server is running in simple singleplayer mode.  You cannot connect.",
-       "Your client's version is not supported.\nPlease contact server administrator.",
-       "Player name contains disallowed characters.",
-       "Player name not allowed.",
-       "Too many users.",
+       "Your client's version is not supported.\nPlease contact the server administrator.",
+       "Player name contains disallowed characters",
+       "Player name not allowed",
+       "Too many users",
        "Empty passwords are disallowed.  Set a password and try again.",
        "Another client is connected with this name.  If your client closed unexpectedly, try again in a minute.",
-       "Server authentication failed.  This is likely a server error.",
+       "Internal server error",
        "",
-       "Server shutting down.",
-       "This server has experienced an internal error. You will now be disconnected."
+       "Server shutting down",
+       "The server has experienced an internal error.  You will now be disconnected."
 };
 
 enum PlayerListModifer : u8