diff options
Diffstat (limited to 'MCServer')
| -rw-r--r-- | MCServer/Plugins/APIDump/APIDesc.lua | 3 | ||||
| m--------- | MCServer/Plugins/Core | 0 | ||||
| -rw-r--r-- | MCServer/monsters.ini | 44 |
3 files changed, 24 insertions, 23 deletions
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua index 01554d99c..34aff5ddb 100644 --- a/MCServer/Plugins/APIDump/APIDesc.lua +++ b/MCServer/Plugins/APIDump/APIDesc.lua @@ -2031,6 +2031,7 @@ end BroadcastChatInfo = { Params = "Message, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Prepends Yellow [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For informational messages, such as command usage." }, BroadcastChatSuccess = { Params = "Message, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Prepends Green [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For success messages." }, BroadcastChatWarning = { Params = "Message, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Prepends Rose [WARN] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For concerning events, such as plugin reload etc." }, + BroadcastParticleEffect = { Params = "ParticleName, X, Y, Z, OffSetX, OffSetY, OffSetZ, ParticleData, ParticleAmmount, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Spawns the specified particles to all players in the world exept the optional ExeptClient. A list of available particles by thinkofdeath can be found {{https://gist.github.com/thinkofdeath/5110835|Here}}" }, BroadcastSoundEffect = { Params = "SoundName, X, Y, Z, Volume, Pitch, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Sends the specified sound effect to all players in this world, except the optional ExceptClient" }, BroadcastSoundParticleEffect = { Params = "EffectID, X, Y, Z, EffectData, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Sends the specified effect to all players in this world, except the optional ExceptClient" }, CastThunderbolt = { Params = "X, Y, Z", Return = "", Notes = "Creates a thunderbolt at the specified coords" }, @@ -2117,6 +2118,7 @@ end QueueSaveAllChunks = { Params = "", Return = "", Notes = "Queues all chunks to be saved in the world storage thread" }, QueueSetBlock = { Params = "BlockX, BlockY, BlockZ, BlockType, BlockMeta, TickDelay", Return = "", Notes = "Queues the block to be set to the specified blocktype and meta after the specified amount of game ticks. Uses SetBlock() for the actual setting, so simulators are woken up and block entities are handled correctly." }, QueueTask = { Params = "TaskFunction", Return = "", Notes = "Queues the specified function to be executed in the tick thread. This is the primary means of interaction with a cWorld from the WebAdmin page handlers (see {{WebWorldThreads}}). The function signature is <pre class=\"pretty-print lang-lua\">function()</pre>All return values from the function are ignored. Note that this function is actually called *after* the QueueTask() function returns. Note that it is unsafe to store references to MCServer objects, such as entities, across from the caller to the task handler function; store the EntityID instead." }, + QueueUnloadUnusedChunks = { Params = "", Return = "", Notes = "Queues a cTask that unloads chunks that are no longer needed and are saved." }, RegenerateChunk = { Params = "ChunkX, ChunkZ", Return = "", Notes = "Queues the specified chunk to be re-generated, overwriting the current data. To queue a chunk for generating only if it doesn't exist, use the GenerateChunk() instead." }, ScheduleTask = { Params = "DelayTicks, TaskFunction", Return = "", Notes = "Queues the specified function to be executed in the world's tick thread after a the specified number of ticks. This enables operations to be queued for execution in the future. The function signature is <pre class=\"pretty-print lang-lua\">function({{cWorld|World}})</pre>All return values from the function are ignored. Note that it is unsafe to store references to MCServer objects, such as entities, across from the caller to the task handler function; store the EntityID instead." }, SendBlockTo = { Params = "BlockX, BlockY, BlockZ, {{cPlayer|Player}}", Return = "", Notes = "Sends the block at the specified coords to the specified player's client, as an UpdateBlock packet." }, @@ -2146,7 +2148,6 @@ end SpawnExperienceOrb = { Params = "X, Y, Z, Reward", Return = "EntityID", Notes = "Spawns an {{cExpOrb|experience orb}} at the specified coords, with the given reward" }, SpawnPrimedTNT = { Params = "X, Y, Z, FuseTimeSecs, InitialVelocityCoeff", Return = "", Notes = "Spawns a {{cTNTEntity|primed TNT entity}} at the specified coords, with the given fuse time. The entity gets a random speed multiplied by the InitialVelocityCoeff, 1 being the default value." }, TryGetHeight = { Params = "BlockX, BlockZ", Return = "IsValid, Height", Notes = "Returns true and height of the highest non-air block if the chunk is loaded, or false otherwise." }, - UnloadUnusedChunks = { Params = "", Return = "", Notes = "Unloads chunks that are no longer needed, and are saved. NOTE: This API is deprecated and will be removed soon." }, UpdateSign = { Params = "X, Y, Z, Line1, Line2, Line3, Line4, [{{cPlayer|Player}}]", Return = "", Notes = "Sets the sign text at the specified coords. The sign-updating hooks are called for the change. The Player parameter is used to indicate the player from whom the change has come, it may be nil. Same as SetSignLiens()" }, UseBlockEntity = { Params = "{{cPlayer|Player}}, BlockX, BlockY, BlockZ", Return = "", Notes = "Makes the specified Player use the block entity at the specified coords (open chest UI, etc.) If the cords are in an unloaded chunk or there's no block entity, ignores the call." }, WakeUpSimulators = { Params = "BlockX, BlockY, BlockZ", Return = "", Notes = "Wakes up the simulators for the specified block." }, diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core -Subproject 8ddc8a9d027a9471c72270ec82cc618069710fa +Subproject 5c8557d4fdfa580c100510cde07a1a778ea2e24 diff --git a/MCServer/monsters.ini b/MCServer/monsters.ini index a1b63423e..8cd956157 100644 --- a/MCServer/monsters.ini +++ b/MCServer/monsters.ini @@ -1,61 +1,61 @@ [Spider] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=2.0 SightDistance=25.0 MaxHealth=16 [Chicken] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=1.0 SightDistance=25.0 MaxHealth=4 [Cow] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=1.0 SightDistance=25.0 MaxHealth=10 [Pig] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=1.0 SightDistance=25.0 MaxHealth=10 [Sheep] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=1.0 SightDistance=25.0 MaxHealth=8 [Squid] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=1.0 SightDistance=25.0 MaxHealth=10 [Enderman] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=4.0 SightDistance=25.0 MaxHealth=40 [Zombiepigman] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=7.0 SightDistance=25.0 MaxHealth=20 [Cavespider] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=2.0 SightDistance=25.0 @@ -76,7 +76,7 @@ SightDistance=50.0 MaxHealth=10 [Silverfish] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=1.0 SightDistance=25.0 @@ -89,21 +89,21 @@ SightDistance=40.0 MaxHealth=20 [Slime] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=4.0 SightDistance=25.0 MaxHealth=16 [Zombie] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=4.0 SightDistance=25.0 MaxHealth=20 [Wolf] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=4.0 SightDistance=25.0 @@ -117,14 +117,14 @@ SightDistance=25.0 MaxHealth=20 [Villager] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=0.0 SightDistance=25.0 MaxHealth=20 [Witch] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=0.0 SightDistance=25.0 @@ -132,49 +132,49 @@ MaxHealth=26 [Ocelot] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=0.0 SightDistance=25.0 MaxHealth=10 [Mooshroom] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=0.0 SightDistance=25.0 MaxHealth=10 [Magmacube] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=6.0 SightDistance=25.0 MaxHealth=16 [Horse] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=6.0 SightDistance=25.0 MaxHealth=30 [EnderDragon] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=6.0 SightDistance=25.0 MaxHealth=200 [Giant] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=6.0 SightDistance=25.0 MaxHealth=100 [IronGolem] -AttackRange=5.0 +AttackRange=2.0 AttackRate=1 AttackDamage=6.0 SightDistance=25.0 |