Started adding /ride

Author: ThePython10110

API/entity.lua

@@ -105,7 +105,39 @@ function better_commands.entity_from_alias(alias, list)
     return entities[math.random(1, #entities)]
 end
 
----Handles rotation when summoning/teleporting
+---Handles Vector2 (yaw/pitch) rotation in split_param
+---@param base_rot vector.Vector
+---@param split_param splitParam
+---@param i integer
+---@param no_relative boolean?
+---@return vector.Vector?
+---@return string?
+function better_commands.handle_vector2_rot(base_rot, split_param, i, no_relative)
+    base_rot = table.copy(base_rot)
+    if split_param[i] then
+        if not split_param[i+1] then
+            return nil, S("Missing second rotation coordinate")
+        end
+        if split_param[i].type == "number" then
+            base_rot.y = math.rad(tonumber(split_param[i][3]) or 0)
+        elseif split_param[i].type == "relative" and not no_relative then
+            base_rot.y = base_rot.y+math.rad(tonumber(split_param[i][3]:sub(2,-1)) or 0)
+        else
+            return nil, S("Invalid rotation coordinate @1", split_param[i][3])
+        end
+        if split_param[i+1].type == "number" then
+            base_rot.x = math.rad(tonumber(split_param[i+1][3]) or 0)
+        elseif split_param[i+1].type == "relative" and not no_relative then
+            base_rot.x = base_rot.x+math.rad(tonumber(split_param[i+1][3]:sub(2,-1)) or 0)
+        else
+            return nil, S("Invalid rotation coordinate @1", split_param[i+1][3])
+        end
+        return base_rot
+    end
+    return base_rot
+end
+
+---Handles rotation in various commands
 ---@param context contextTable
 ---@param victim minetest.ObjectRef|vector.Vector
 ---@param split_param splitParam[]
@@ -118,21 +150,17 @@ function better_commands.get_tp_rot(context, victim, split_param, i)
     if split_param[i] then
         local yaw_pitch
         local facing
-        if split_param[i].type == "number" then
-            victim_rot.y = math.rad(tonumber(split_param[i][3]) or 0)
+        if split_param[i].type == "number" or split_param[i].type == "relative" then
             yaw_pitch = true
         elseif split_param[i].type == "relative" then
-            victim_rot.y = victim_rot.y+math.rad(tonumber(split_param[i][3]:sub(2,-1)) or 0)
             yaw_pitch = true
         elseif split_param[i][3] == "facing" then
             facing = true
+        else
+            return nil, S("Invalid rotation")
         end
-        if yaw_pitch and split_param[i+1] then
-            if split_param[i+1].type == "number" then
-                victim_rot.x = math.rad(tonumber(split_param[i+1][3]) or 0)
-            elseif split_param[i+1].type == "relative" then
-                victim_rot.x = victim_rot.x+math.rad(tonumber(split_param[i+1][3]:sub(2,-1)) or 0)
-            end
+        if yaw_pitch then
+            return better_commands.handle_vector2_rot(victim_rot, split_param, i)
         elseif facing and split_param[i+1] then
             if split_param[i+1].type == "selector" then
                 local targets, err = better_commands.parse_selector(split_param[i+1], context, true)

CHANGELOG.md

@@ -36,7 +36,7 @@
 * Removed `anchored` execute subcommand (if you want to have rotation anchors, make a PR, because I can't think of any good way to do it)
 * Command results are now shown to other players as well, unless `better_commands.send_command_feedback` is disabled
 * Error messages are now red
-* Some command me2ssages now match ACOVG's better
+* Some command messages now match ACOVG's better
 ### Bugfixes
 * Fixed a bug with the `/kill` command (it should work now).
 * The `rm`/`r` selector arguments now actually treat their values as numbers (not strings), and are now inclusive as intended.

COMMANDS/COMMANDS.lua

@@ -20,6 +20,7 @@ local command_files = {
     "settings",
     "stop",
     "weather",
+    "ride",
 }
 
 local mcl_only = {

COMMANDS/ride.lua

@@ -0,0 +1,49 @@
+S = minetest.get_translator(minetest.get_current_modname())
+
+better_commands.register_command("ride", {
+    description = "Allows entities to mount or dismount other entities.",
+    params = "<target> <action> [vehicle|entityType] [bone] [pos] [rot] [teleportRules] [nameTag] [rideRules]",
+    privs = {server = true},
+    func = function (name, param, context)
+        local split_param, err = better_commands.parse_params(param)
+        if err or not split_param then return false, better_commands.error(err), 0 end
+        local target_selector = split_param[1]
+        if not target_selector then return false, better_commands.error(S("Missing target")), 0 end
+        local action = split_param[2] and split_param[2][3]
+        if not action then return false, better_commands.error(S("Missing action")), 0 end
+        if action == "mount" or action == "start_riding" then
+            local vehicle_selector = split_param[3]
+            local teleport_ride, bone, pos,           rot, err =
+                  false,         "",   vector.zero(), vector.zero()
+            if not vehicle_selector then return false, better_commands.error(S("Missing vehicle")), 0 end
+            bone = split_param[4] and split_param[4][3]
+            if not bone or bone == "_" then bone = "" end
+            if split_param[5] then
+                pos, err = better_commands.parse_pos(split_param, 5, context)
+                if err or not pos then return false, better_commands.error(err), 0 end
+                if split_param[8] then
+                    rot, err = better_commands.handle_vector2_rot(rot, split_param, 8, false)
+                    if err or not rot then return false, better_commands.error(err), 0 end
+                    local teleport_rules = split_param[10] and split_param[10][3]
+                    if teleport_rules then
+                        if teleport_rules == "teleport_ride" then
+                            teleport_ride = true
+                        elseif teleport_rules ~= "teleport_rider" then
+                            return false, better_commands.error(S("Expected teleport_ride|teleport_rider, got @1", teleport_rules)), 0
+                        end
+                    end
+                end
+            end
+            local target, err = better_commands.parse_selector(target_selector, context, true)
+            if err or not target then return false, better_commands.error(err), 0 end
+            local vehicle, err = better_commands.parse_selector(vehicle_selector, context, true)
+            if err or not vehicle then return false, better_commands.error(err), 0 end
+            if target[1] == vehicle[1] then
+                return false, better_commands.error("Cannot attach entity to itself"), 0
+            end
+            target[1]:set_attach(vehicle[1], bone, pos, rot)
+            return true, S("Attached @1 to @2", better_commands.get_entity_name(target[1]), better_commands.get_entity_name(vehicle[1])), 1
+        end
+        return false, nil, 0
+    end
+})

COMMANDS/weather.lua

@@ -64,7 +64,7 @@ better_commands.register_command("weather", {
         (better_commands.mcl and " [<duration>])" or ""),
     func = function (name, param, context)
         local split_param, err = better_commands.parse_params(param)
-        if err or not split_param then return false, err, 0 end
+        if err or not split_param then return false, better_commands.error(err), 0 end
         if not split_param[1] then
             return false, nil, 0
         end
@@ -84,7 +84,7 @@ better_commands.register_command("weather", {
                     return false, better_commands.error(S("Unexpected argument: @1", split_param[2][3])), 0
                 else
                     local duration, err = better_commands.parse_time_string(split_param[2][3], true)
-                    if err or not duration then return false, err, 0 end
+                    if err or not duration then return false, better_commands.error(err), 0 end
                     local tps = tonumber(minetest.settings:get("time_speed"))
                     -- Don't ask how the math works; I already forgot.
                     local duration_s = duration*24000/(tps/3.6)
@@ -94,7 +94,7 @@ better_commands.register_command("weather", {
             set_weather(w, end_time)
             return true, S("Set weather to @1", split_param[1][3])
         else
-            return false, S("Invalid weather: @1", split_param[1][3])
+            return false, better_commands.error(S("Invalid weather: @1", split_param[1][3]))
         end
     end
 })
@@ -109,7 +109,7 @@ better_commands.register_command("toggledownfall", {
             if new_weather then
                 set_weather(new_weather)
             else
-                return false, S("No weather called 'rain'"), 0
+                return false, better_commands.error(S("No weather called 'rain'")), 0
             end
         else
             set_weather("none")

TODO.md

@@ -5,7 +5,7 @@ A place for me to write out my future plans. I decide what to do next [randomly]
 Things that *must* be done before the next release
 - [ ] `/give <player> <item_without_metadata> <count>` only gives 1 item.
   - Items with metadata work fine.
-
+- [ ] Test potentially broken summon/tp rotation
 
 
 
@@ -103,7 +103,7 @@ Things that I hope to do *eventually*.
   - [ ] `testforblock`
   - [ ] `testforblocks`
   - [ ] `tickingarea`?
-  - [ ] `toggledownfall` (depending on mods)
-  - [ ] `weather` (depending on mods)
+  - [x] `toggledownfall` (depending on mods)
+  - [x] `weather` (depending on mods)
   - [ ] `whitelist`
   - [ ] `worldborder`? (maybe not visible, probably no collision)