forked from VoxeLibre/VoxeLibre
Compare commits
3 Commits
master
...
hardcore_m
Author | SHA1 | Date |
---|---|---|
|
03e2f444cc | |
|
aa6b9d3089 | |
|
feab15bd3b |
|
@ -4,5 +4,4 @@
|
||||||
*.blend2
|
*.blend2
|
||||||
*.blend3
|
*.blend3
|
||||||
/.idea/
|
/.idea/
|
||||||
*.xcf
|
*.xcf
|
||||||
.Rproj.user
|
|
24
.luacheckrc
24
.luacheckrc
|
@ -1,12 +1,10 @@
|
||||||
---@diagnostic disable
|
|
||||||
|
|
||||||
unused_args = false
|
unused_args = false
|
||||||
allow_defined_top = true
|
allow_defined_top = true
|
||||||
max_line_length = false
|
max_line_length = false
|
||||||
redefined = false
|
redefined = false
|
||||||
|
|
||||||
globals = {
|
globals = {
|
||||||
"minetest", "core",
|
"minetest", "core",
|
||||||
}
|
}
|
||||||
|
|
||||||
read_globals = {
|
read_globals = {
|
||||||
|
@ -42,16 +40,16 @@ read_globals = {
|
||||||
"factorial"
|
"factorial"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
------
|
------
|
||||||
--MODS
|
--MODS
|
||||||
------
|
------
|
||||||
|
|
||||||
--GENERAL
|
--GENERAL
|
||||||
"default",
|
"default",
|
||||||
|
|
||||||
--ENTITIES
|
--ENTITIES
|
||||||
"cmi",
|
"cmi",
|
||||||
|
|
||||||
--HUD
|
--HUD
|
||||||
"sfinv", "sfinv_buttons", "unified_inventory", "cmsg", "inventory_plus",
|
"sfinv", "sfinv_buttons", "unified_inventory", "cmsg", "inventory_plus",
|
||||||
}
|
}
|
22
.luarc.json
22
.luarc.json
|
@ -1,22 +0,0 @@
|
||||||
{
|
|
||||||
"runtime.version": "LuaJIT",
|
|
||||||
"diagnostics": { "disable": ["lowercase-global"] },
|
|
||||||
"diagnostics.globals": [
|
|
||||||
"minetest",
|
|
||||||
"dump",
|
|
||||||
"dump2",
|
|
||||||
"Raycast",
|
|
||||||
"Settings",
|
|
||||||
"PseudoRandom",
|
|
||||||
"PerlinNoise",
|
|
||||||
"VoxelManip",
|
|
||||||
"SecureRandom",
|
|
||||||
"VoxelArea",
|
|
||||||
"PerlinNoiseMap",
|
|
||||||
"PcgRandom",
|
|
||||||
"ItemStack",
|
|
||||||
"AreaStore",
|
|
||||||
"vector"
|
|
||||||
],
|
|
||||||
"workspace.ignoreDir": [".luacheckrc"]
|
|
||||||
}
|
|
1
API.md
1
API.md
|
@ -41,7 +41,6 @@ A lot of things are possible by using one of the APIs in the mods. Note that not
|
||||||
* Beds: `ITEMS/mcl_beds`
|
* Beds: `ITEMS/mcl_beds`
|
||||||
* Buckets: `ITEMS/mcl_buckets`
|
* Buckets: `ITEMS/mcl_buckets`
|
||||||
* Dispenser support: `ITEMS/REDSTONE/mcl_dispensers`
|
* Dispenser support: `ITEMS/REDSTONE/mcl_dispensers`
|
||||||
* Campfires: `ITEMS/mcl_campfires`
|
|
||||||
|
|
||||||
### Mobs
|
### Mobs
|
||||||
* Mobs: `ENTITIES/mcl_mobs`
|
* Mobs: `ENTITIES/mcl_mobs`
|
||||||
|
|
|
@ -2,16 +2,17 @@
|
||||||
So you want to contribute to MineClone2?
|
So you want to contribute to MineClone2?
|
||||||
Wow, thank you! :-)
|
Wow, thank you! :-)
|
||||||
|
|
||||||
MineClone2 is maintained by AncientMariner and Nicu. If you have any
|
MineClone2 is maintained by Nicu and Cora. If you have any
|
||||||
problems or questions, contact us on Discord/Matrix (See Links section below).
|
problems or questions, contact us (See Links section below).
|
||||||
|
|
||||||
You can help with MineClone2's development in many different ways,
|
You can help with MineClone2's development in many different ways,
|
||||||
whether you're a programmer or not.
|
whether you're a programmer or not.
|
||||||
|
|
||||||
## MineClone2's development target is to...
|
## MineClone2's development target is to...
|
||||||
- Create a stable, peformant, moddable, free/libre game based on Minecraft
|
- Crucially, create a stable, moddable, free/libre clone of Minecraft
|
||||||
using the Minetest engine, usable in both singleplayer and multiplayer.
|
based on the Minetest engine with polished features, usable in both
|
||||||
- Currently, a lot of features are already implemented.
|
singleplayer and multiplayer. Currently, a lot of Minecraft features
|
||||||
|
are already implemented.
|
||||||
Polishing existing features is always welcome.
|
Polishing existing features is always welcome.
|
||||||
|
|
||||||
## Links
|
## Links
|
||||||
|
@ -75,7 +76,7 @@ in singleplayer, post a screenshot of the message that Minetest showed
|
||||||
when the crash happened (or copy the message into your issue). If you
|
when the crash happened (or copy the message into your issue). If you
|
||||||
are a server admin, you can find error messages in the log file of the
|
are a server admin, you can find error messages in the log file of the
|
||||||
server.
|
server.
|
||||||
* Tell us which MineClone2 and Minetest versions you are using (from Minetest 5.7 type /ver, for previous versions, check the game.conf or README.md file).
|
* Tell us which MineClone2 and Minetest versions you are using.
|
||||||
* Tell us how to reproduce the problem: What you were doing to trigger
|
* Tell us how to reproduce the problem: What you were doing to trigger
|
||||||
the bug, e.g. before the crash happened or what causes the faulty
|
the bug, e.g. before the crash happened or what causes the faulty
|
||||||
behavior.
|
behavior.
|
||||||
|
@ -119,11 +120,11 @@ It's also a good idea to join the Discord server
|
||||||
(or alternatively IRC or Matrix).
|
(or alternatively IRC or Matrix).
|
||||||
|
|
||||||
#### Textures
|
#### Textures
|
||||||
For textures we prefer original art, but in the absence of that will accept
|
For textures we use the Pixel Perfection texture pack. For older Minecraft
|
||||||
Pixel Perfection texture pack contributions. Be warned many of the newer
|
features that is mostly enough but a lot of the newer textures in it are
|
||||||
textures in it are copies or slight modifications of the original MC textures
|
copies or slight modifications of the original MC textures so great caution
|
||||||
so great caution needs to be taken when using any textures coming from
|
needs to be taken when using any textures coming from Minecraft texture
|
||||||
Minecraft texture packs.
|
packs.
|
||||||
If you want to make such contributions, join our Discord server. Demands
|
If you want to make such contributions, join our Discord server. Demands
|
||||||
for textures will be communicated there.
|
for textures will be communicated there.
|
||||||
|
|
||||||
|
@ -134,10 +135,7 @@ resource pack or minetest_game. Unfortunately, MineClone2 does not play
|
||||||
a sound in every situation you would get one in Minecraft. Any help with
|
a sound in every situation you would get one in Minecraft. Any help with
|
||||||
sounds is greatly appreciated, however if you add new sounds you should
|
sounds is greatly appreciated, however if you add new sounds you should
|
||||||
probably work together with a programmer, to write the code to actually
|
probably work together with a programmer, to write the code to actually
|
||||||
play these sounds in game. All sounds should be released under an open
|
play these sounds in game.
|
||||||
source license with clear information on the source, licencing and any
|
|
||||||
changes made by the contributor. Use the README files in the mod to
|
|
||||||
communicate this information.
|
|
||||||
|
|
||||||
#### 3D Models
|
#### 3D Models
|
||||||
Most of the 3D Models in MineClone2 come from
|
Most of the 3D Models in MineClone2 come from
|
||||||
|
@ -147,9 +145,9 @@ Blender on demand. Many of the models have to be patched, some new
|
||||||
animations have to be added etc.
|
animations have to be added etc.
|
||||||
|
|
||||||
#### Crediting
|
#### Crediting
|
||||||
Asset contributions will be credited in their mods and their own respective
|
Asset contributions will be credited in their own respective sections in
|
||||||
sections in CREDITS.md. If you have commited the results yourself, you will
|
CREDITS.md. If you have commited the results yourself, you will also be
|
||||||
also be credited in the Contributors section.
|
credited in the Contributors section.
|
||||||
|
|
||||||
### Contributing Translations
|
### Contributing Translations
|
||||||
|
|
||||||
|
@ -184,12 +182,7 @@ information about the game's performance and let us know places to
|
||||||
investigate optimization issues. This way we can make the game faster.
|
investigate optimization issues. This way we can make the game faster.
|
||||||
|
|
||||||
#### Using Minetest's profiler
|
#### Using Minetest's profiler
|
||||||
We frequently will use profiling to optimise our code. We recommend use of
|
Minetest has a built in profiler. Simply set `profiler.load = true` in
|
||||||
the JIT profiler (RIP Jude) to fully understand performance impact:
|
|
||||||
|
|
||||||
https://content.minetest.net/packages/jwmhjwmh/jitprofiler/
|
|
||||||
|
|
||||||
Minetest also has a built in profiler. Simply set `profiler.load = true` in
|
|
||||||
your configuration file and restart the server. After running the server
|
your configuration file and restart the server. After running the server
|
||||||
for some time, just run `/profiler save` in chat - then you will find a
|
for some time, just run `/profiler save` in chat - then you will find a
|
||||||
file in the world directory containing the results. Open a new issue and
|
file in the world directory containing the results. Open a new issue and
|
||||||
|
@ -220,14 +213,10 @@ they have made their donation Incognito).
|
||||||
* Fork the repository (in case you have not already)
|
* Fork the repository (in case you have not already)
|
||||||
* Do your change in a new branch
|
* Do your change in a new branch
|
||||||
* Create a pull request to get your changes merged into master
|
* Create a pull request to get your changes merged into master
|
||||||
* It is important that conflicts are resolved prior to merging the pull
|
* Keep your pull request up to date by regularly merging upstream. It is
|
||||||
|
imperative that conflicts are resolved prior to merging the pull
|
||||||
request.
|
request.
|
||||||
* We update our branches via rebasing. Please avoid merging master into
|
* After the pull request got merged, you can delete the branch
|
||||||
your branch unless it's the only way you can resolve a conflict. We can
|
|
||||||
rebase branches from the GUI if the user has not merged master into the
|
|
||||||
branch.
|
|
||||||
* After the pull request got merged, you can delete the branch if the
|
|
||||||
merger hasn't done this already.
|
|
||||||
|
|
||||||
### Discuss first
|
### Discuss first
|
||||||
If you feel like a problem needs to fixed or you want to make a new
|
If you feel like a problem needs to fixed or you want to make a new
|
||||||
|
@ -251,7 +240,7 @@ work causes problems, we ask you fix the issues as soon as possible.
|
||||||
|
|
||||||
### Changing Gameplay
|
### Changing Gameplay
|
||||||
Pull Requests that change gameplay have to be properly researched and
|
Pull Requests that change gameplay have to be properly researched and
|
||||||
need to state their sources. These PRs also need the maintainer's approval
|
need to state their sources. These PRs also need Fleckenstein's approval
|
||||||
before they are merged.
|
before they are merged.
|
||||||
You can use these sources:
|
You can use these sources:
|
||||||
|
|
||||||
|
@ -273,7 +262,9 @@ excessive git bureaucracy commits in master)
|
||||||
* Submodules should only be used if a) upstream is highly reliable and
|
* Submodules should only be used if a) upstream is highly reliable and
|
||||||
b) it is 100% certain that no mcl2 specific changes to the code will be
|
b) it is 100% certain that no mcl2 specific changes to the code will be
|
||||||
needed (this has never been the case before, hence mcl2 is submodule free so far)
|
needed (this has never been the case before, hence mcl2 is submodule free so far)
|
||||||
* Commit messages should be descriptive
|
* Commit messages should be descriptive and never contain mcl2 specific
|
||||||
|
issueids - there are other projects who might use commits from mcl2 and
|
||||||
|
it will confuse their issue trackers.
|
||||||
* Try to group your submissions best as you can:
|
* Try to group your submissions best as you can:
|
||||||
* Try to keep your PRs small: In some cases things reasonably be can't
|
* Try to keep your PRs small: In some cases things reasonably be can't
|
||||||
split up but in general multiple small PRs are better than a big one.
|
split up but in general multiple small PRs are better than a big one.
|
||||||
|
@ -357,24 +348,18 @@ end
|
||||||
|
|
||||||
### Developer status
|
### Developer status
|
||||||
Active and trusted contributors are often granted write access to the
|
Active and trusted contributors are often granted write access to the
|
||||||
MineClone2 repository as a contributor. Those that have demonstrated the right
|
MineClone2 repository.
|
||||||
technical skills and behaviours may be granted developer access. These are the
|
|
||||||
most trusted contributors who will contribute to ensure coding standards and
|
|
||||||
processes are followed.
|
|
||||||
|
|
||||||
#### Developer responsibilities
|
#### Developer responsibilities
|
||||||
- If you have developer/contributor privileges you can just open a new branch
|
- If you have developer privileges you can just open a new branch in the
|
||||||
in the mcl2 repository (which is preferred). From that you create a pull request.
|
mcl2 repository (which is preferred). From that you create a pull request.
|
||||||
This way other people can review your changes and make sure they work
|
This way other people can review your changes and make sure they work
|
||||||
before they get merged.
|
before they get merged.
|
||||||
- If you do not (yet) have developer privs you do your work on a branch
|
- If you do not (yet) have developer privs you do your work on a branch
|
||||||
on your private repository e.g. using the "fork" function on mesehub.
|
on your private repository e.g. using the "fork" function on mesehub.
|
||||||
- Any developer is welcome to review, test and approve PRs. A maintainer may prefer
|
- Any developer is welcome to review, test and merge PRs. A PR needs
|
||||||
to merge the PR especially if it is in a similar area to what has been worked on
|
at least one approval (by someone else than the author) but the maintainers
|
||||||
and could result in merge conflicts for a larger older branch, or needs
|
are usually relatively quick to react to new submissions.
|
||||||
art/licencing reviewing. A PR needs at least one approval (by someone else other
|
|
||||||
than the author).
|
|
||||||
- The maintainers are usually relatively quick to react to new submissions.
|
|
||||||
|
|
||||||
### Maintainer status
|
### Maintainer status
|
||||||
Maintainers carry the main responsibility for the project.
|
Maintainers carry the main responsibility for the project.
|
||||||
|
@ -390,7 +375,7 @@ merged.
|
||||||
- Resolving conflicts and problems within the community
|
- Resolving conflicts and problems within the community
|
||||||
|
|
||||||
#### Current maintainers
|
#### Current maintainers
|
||||||
* AncientMariner - responsible for gameplay review, publishing releases,
|
* Cora - responsible for gameplay review, publishing releases,
|
||||||
technical guidelines
|
technical guidelines
|
||||||
* Nicu - responsible for community related issues
|
* Nicu - responsible for community related issues
|
||||||
|
|
||||||
|
|
95
CREDITS.md
95
CREDITS.md
|
@ -6,42 +6,39 @@
|
||||||
## Creator of MineClone2
|
## Creator of MineClone2
|
||||||
* Wuzzy
|
* Wuzzy
|
||||||
|
|
||||||
|
|
||||||
## Maintainers
|
## Maintainers
|
||||||
* AncientMariner
|
* AncientMariner
|
||||||
* Nicu
|
* Nicu
|
||||||
|
|
||||||
## Previous Maintainers
|
## Previous Maintainers
|
||||||
* Fleckenstein
|
* Fleckenstein
|
||||||
|
* jordan4ibanez
|
||||||
* cora
|
* cora
|
||||||
|
|
||||||
## Developers
|
## Developers
|
||||||
|
* bzoss
|
||||||
* AFCMS
|
* AFCMS
|
||||||
* epCode
|
* epCode
|
||||||
|
* ryvnf
|
||||||
|
* iliekprogrammar
|
||||||
|
* MysticTempest
|
||||||
|
* Rootyjr
|
||||||
|
* aligator
|
||||||
|
* Code-Sploit
|
||||||
|
* NO11
|
||||||
|
* kabou
|
||||||
|
* rudzik8
|
||||||
* chmodsayshello
|
* chmodsayshello
|
||||||
* PrairieWind
|
* PrairieWind
|
||||||
* MrRar
|
* RandomLegoBrick
|
||||||
* FossFanatic
|
|
||||||
* SmokeyDope
|
|
||||||
|
|
||||||
## Past Developers
|
|
||||||
* jordan4ibanez
|
|
||||||
* iliekprogrammar
|
|
||||||
* kabou
|
|
||||||
* kay27
|
|
||||||
* Faerraven / Michieal
|
|
||||||
* MysticTempest
|
|
||||||
* NO11
|
|
||||||
* SumianVoice
|
* SumianVoice
|
||||||
|
* MrRar
|
||||||
|
* talamh
|
||||||
|
* Faerraven / Michieal
|
||||||
|
* FossFanatic
|
||||||
|
|
||||||
## Contributors
|
## Contributors
|
||||||
* RandomLegoBrick
|
|
||||||
* rudzik8
|
|
||||||
* Code-Sploit
|
|
||||||
* aligator
|
|
||||||
* Rootyjr
|
|
||||||
* ryvnf
|
|
||||||
* bzoss
|
|
||||||
* talamh
|
|
||||||
* Laurent Rocher
|
* Laurent Rocher
|
||||||
* HimbeerserverDE
|
* HimbeerserverDE
|
||||||
* TechDudie
|
* TechDudie
|
||||||
|
@ -70,10 +67,6 @@
|
||||||
* Marcin Serwin
|
* Marcin Serwin
|
||||||
* erlehmann
|
* erlehmann
|
||||||
* E
|
* E
|
||||||
* n_to
|
|
||||||
* debiankaios
|
|
||||||
* Gustavo6046 / wallabra
|
|
||||||
* CableGuy67
|
|
||||||
* Benjamin Schötz
|
* Benjamin Schötz
|
||||||
* Doloment
|
* Doloment
|
||||||
* Sydney Gems
|
* Sydney Gems
|
||||||
|
@ -88,12 +81,15 @@
|
||||||
* aldum
|
* aldum
|
||||||
* Dieter44
|
* Dieter44
|
||||||
* Pepebotella
|
* Pepebotella
|
||||||
|
* MrRar
|
||||||
* Lazerbeak12345
|
* Lazerbeak12345
|
||||||
* mrminer
|
* mrminer
|
||||||
* Thunder1035
|
* Thunder1035
|
||||||
* opfromthestart
|
* opfromthestart
|
||||||
* snowyu
|
* snowyu
|
||||||
* FaceDeer
|
* FaceDeer
|
||||||
|
* Faerraven / Michieal
|
||||||
|
* FossFanatic
|
||||||
* Herbert West
|
* Herbert West
|
||||||
* GuyLiner
|
* GuyLiner
|
||||||
* 3raven
|
* 3raven
|
||||||
|
@ -103,22 +99,25 @@
|
||||||
* Gregor Parzefall
|
* Gregor Parzefall
|
||||||
* Wbjitscool
|
* Wbjitscool
|
||||||
* b3nderman
|
* b3nderman
|
||||||
* CyberMango
|
|
||||||
* gldrk
|
|
||||||
* atomdmac
|
|
||||||
* emptyshore
|
|
||||||
* FlamingRCCars
|
|
||||||
* uqers
|
|
||||||
* Niterux
|
|
||||||
* appgurueu
|
|
||||||
* seventeenthShulker
|
|
||||||
|
|
||||||
## Music
|
## MineClone5
|
||||||
* Jordach for the jukebox music compilation from Big Freaking Dig
|
* kay27
|
||||||
* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/
|
* Debiankaios
|
||||||
* Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)
|
* epCode
|
||||||
* Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)
|
* NO11
|
||||||
* Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)
|
* j45
|
||||||
|
* chmodsayshello
|
||||||
|
* 3raven
|
||||||
|
* PrairieWind
|
||||||
|
* Gustavo6046 / wallabra
|
||||||
|
* CableGuy67
|
||||||
|
* MrRar
|
||||||
|
|
||||||
|
## Mineclonia
|
||||||
|
* erlehmann
|
||||||
|
* Li0n
|
||||||
|
* E
|
||||||
|
* n_to
|
||||||
|
|
||||||
## Original Mod Authors
|
## Original Mod Authors
|
||||||
* Wuzzy
|
* Wuzzy
|
||||||
|
@ -150,18 +149,14 @@
|
||||||
* 4Evergreen4
|
* 4Evergreen4
|
||||||
* jordan4ibanez
|
* jordan4ibanez
|
||||||
* paramat
|
* paramat
|
||||||
* debian044 / debian44
|
|
||||||
* chmodsayshello
|
|
||||||
* cora
|
* cora
|
||||||
* Faerraven / Michieal
|
* Faerraven / Michieal
|
||||||
* PrairieWind
|
|
||||||
|
|
||||||
## 3D Models
|
## 3D Models
|
||||||
* 22i
|
* 22i
|
||||||
* tobyplowy
|
* tobyplowy
|
||||||
* epCode
|
* epCode
|
||||||
* Faerraven / Michieal
|
* Faerraven / Michieal
|
||||||
* SumianVoice
|
|
||||||
|
|
||||||
## Textures
|
## Textures
|
||||||
* XSSheep
|
* XSSheep
|
||||||
|
@ -177,10 +172,6 @@
|
||||||
* cora
|
* cora
|
||||||
* Faerraven / Michieal
|
* Faerraven / Michieal
|
||||||
* Nicu
|
* Nicu
|
||||||
* Exhale
|
|
||||||
* Aeonix_Aeon
|
|
||||||
* Wbjitscool
|
|
||||||
* SmokeyDope
|
|
||||||
|
|
||||||
## Translations
|
## Translations
|
||||||
* Wuzzy
|
* Wuzzy
|
||||||
|
@ -195,11 +186,6 @@
|
||||||
* snowyu
|
* snowyu
|
||||||
* 3raven
|
* 3raven
|
||||||
* SakuraRiu
|
* SakuraRiu
|
||||||
* anarquimico
|
|
||||||
* syl
|
|
||||||
* Temak
|
|
||||||
* megustanlosfrijoles
|
|
||||||
* kbundg
|
|
||||||
|
|
||||||
## Funders
|
## Funders
|
||||||
* 40W
|
* 40W
|
||||||
|
@ -207,6 +193,9 @@
|
||||||
* Cora
|
* Cora
|
||||||
|
|
||||||
## Special thanks
|
## Special thanks
|
||||||
* The Minetest team for making and supporting an engine, and distribution infrastructure that makes this all possible
|
* celeron55 for creating Minetest
|
||||||
|
* Jordach for the jukebox music compilation from Big Freaking Dig
|
||||||
|
* wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues.
|
||||||
* The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game
|
* The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game
|
||||||
* Notch and Jeb for being the major forces behind Minecraft
|
* Notch and Jeb for being the major forces behind Minecraft
|
||||||
|
* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/
|
||||||
|
|
10
LEGAL.md
10
LEGAL.md
|
@ -5,7 +5,7 @@ Copying is an act of love. Please copy and share! <3
|
||||||
Here's the detailed legalese for those who need it:
|
Here's the detailed legalese for those who need it:
|
||||||
|
|
||||||
## License of source code
|
## License of source code
|
||||||
MineClone 2 (by Lizzy Fleckenstein, Wuzzy, davedevils and countless others)
|
MineClone 2 (by kay27, EliasFleckenstein, Wuzzy, davedevils and countless others)
|
||||||
is an imitation of Minecraft.
|
is an imitation of Minecraft.
|
||||||
|
|
||||||
MineClone 2 is free software: you can redistribute it and/or modify
|
MineClone 2 is free software: you can redistribute it and/or modify
|
||||||
|
@ -38,15 +38,11 @@ No non-free licenses are used anywhere.
|
||||||
The textures, unless otherwise noted, are based on the Pixel Perfection resource pack for Minecraft 1.11,
|
The textures, unless otherwise noted, are based on the Pixel Perfection resource pack for Minecraft 1.11,
|
||||||
authored by XSSheep. Most textures are verbatim copies, while some textures have been changed or redone
|
authored by XSSheep. Most textures are verbatim copies, while some textures have been changed or redone
|
||||||
from scratch.
|
from scratch.
|
||||||
The glazed terracotta textures have been created by [MysticTempest](https://github.com/MysticTempest).
|
The glazed terracotta textures have been created by (MysticTempest)[https://github.com/MysticTempest].
|
||||||
Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/>
|
Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/>
|
||||||
License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
|
License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
|
||||||
|
|
||||||
Armor trim models were created by Aeonix_Aeon
|
The main menu images are release under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
|
||||||
Source: <https://www.curseforge.com/minecraft/texture-packs/ozocraft-remix>
|
|
||||||
License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/)
|
|
||||||
|
|
||||||
The main menu images are released under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
|
|
||||||
|
|
||||||
All other files, unless mentioned otherwise, fall under:
|
All other files, unless mentioned otherwise, fall under:
|
||||||
Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
|
Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
|
||||||
|
|
75
MODELS.md
75
MODELS.md
|
@ -1,75 +0,0 @@
|
||||||
# Models in Minetest/Mineclone2
|
|
||||||
|
|
||||||
Models are an important part of all entities & unique nodes in Mineclone2. They provide a 3 dimensional map of an object for which textures are then applied to. This document is for modders, it quickly highlights some important information for the software needed to open models in Mineclone2.
|
|
||||||
|
|
||||||
## Minetest Wiki
|
|
||||||
|
|
||||||
For more detailed information on actually using blender to create and modify models for Minetest/Mineclone2, please visit the Minetest wiki's page on using Blender [Here](https://wiki.minetest.net/Using_Blender)
|
|
||||||
|
|
||||||
## Recommended software
|
|
||||||
|
|
||||||
### Blender
|
|
||||||
|
|
||||||
Blender is a very popular and free modeling software supported on Windows, MacOS, and most Linux distributions. It is recommended to use Blender to create and modify 3D models within the minetest engine.
|
|
||||||
|
|
||||||
Download blender [Here](https://www.blender.org/download/)
|
|
||||||
|
|
||||||
### .b3d addon for blender
|
|
||||||
|
|
||||||
Blitz 3D (.b3d) Is one of the main animated model formats used for entities in the minetest engine. It cannot be imported to blender without a plugin called "Import-Export:Bitz 3D format (.b3d)".
|
|
||||||
|
|
||||||
The most up to date version of this Blender plugin can be downloaded [Here](https://github.com/GreenXenith/io_scene_b3d/releases/tag/f189786)
|
|
||||||
|
|
||||||
## Types of model formats
|
|
||||||
|
|
||||||
### Animated, skinned models
|
|
||||||
|
|
||||||
* Blitz 3D files (.b3d)
|
|
||||||
|
|
||||||
* Microsoft DirectX (.x) (binary & text, compression is not supported)
|
|
||||||
|
|
||||||
### Static meshes
|
|
||||||
|
|
||||||
* Wavefront OBJ (.obj)
|
|
||||||
|
|
||||||
Note: The sometimes accompanying .mtl files are not supported and can safely be deleted.
|
|
||||||
|
|
||||||
Note: Do not use .b3d and .x files for static meshes at the moment, Minetest currently spawns animated mesh scene nodes for these, which may result in reduced performance.
|
|
||||||
|
|
||||||
### Supported texture formats
|
|
||||||
|
|
||||||
* .png
|
|
||||||
|
|
||||||
* .jpg
|
|
||||||
|
|
||||||
* .bmp (depreciated, please use .png or .jpg)
|
|
||||||
|
|
||||||
* .tga (depreciated, please use .png or .jpg)
|
|
||||||
|
|
||||||
Note: Any formats not mentioned above but known to work in the past were removed in 5.5.0 and aren't supported anymore.
|
|
||||||
|
|
||||||
## Pros & Cons of .b3d vs .x
|
|
||||||
|
|
||||||
### B3D
|
|
||||||
|
|
||||||
* [+] Binary format means a small size
|
|
||||||
|
|
||||||
* [-] Difficult to postprocess after exporting
|
|
||||||
|
|
||||||
* [-] Difficult to debug problems
|
|
||||||
|
|
||||||
### X (text version)
|
|
||||||
|
|
||||||
* [+] Can be parsed easily with lua scripts
|
|
||||||
|
|
||||||
* [+] Can be easily generated by scripts
|
|
||||||
|
|
||||||
* [+] Easy to debug issues (you can just read it)
|
|
||||||
|
|
||||||
* [+] Can be optimized by quantizing some data
|
|
||||||
|
|
||||||
* [-] Blender exporter is kinda buggy and inefficient
|
|
||||||
|
|
||||||
* [-] Probably still bigger than an equivalent .b3d
|
|
||||||
|
|
||||||
Note: Avoid using the binary X format! It's actually just a tokenized version of the ASCII representation, and may actually be less efficient than a sufficiently optimized text .x file!
|
|
44
README.md
44
README.md
|
@ -27,7 +27,7 @@ Or you can play in “creative mode” in which you can build almost anything in
|
||||||
## How to play (quick start)
|
## How to play (quick start)
|
||||||
### Getting started
|
### Getting started
|
||||||
* **Punch a tree** trunk until it breaks and collect wood
|
* **Punch a tree** trunk until it breaks and collect wood
|
||||||
* Place the **wood into the 2×2 grid** (your “crafting grid” in your inventory menu) and craft 4 wood planks
|
* Place the **wood into the 2×2 grid** (your “crafting grid” in your inventory menu and craft 4 wood planks
|
||||||
* Place the 4 wood planks in a 2×2 shape in the crafting grid to **make a crafting table**
|
* Place the 4 wood planks in a 2×2 shape in the crafting grid to **make a crafting table**
|
||||||
* **Rightclick the crafting table** for a 3×3 crafting grid to craft more complex things
|
* **Rightclick the crafting table** for a 3×3 crafting grid to craft more complex things
|
||||||
* Use the **crafting guide** (book icon) to learn all the possible crafting recipes
|
* Use the **crafting guide** (book icon) to learn all the possible crafting recipes
|
||||||
|
@ -37,15 +37,15 @@ Or you can play in “creative mode” in which you can build almost anything in
|
||||||
|
|
||||||
### Farming
|
### Farming
|
||||||
* Find seeds
|
* Find seeds
|
||||||
* Craft a hoe
|
* Craft hoe
|
||||||
* Rightclick dirt or a similar block with a hoe to create farmland
|
* Rightclick dirt or similar block with hoe to create farmland
|
||||||
* Place seeds on farmland and watch them grow
|
* Place seeds on farmland and watch them grow
|
||||||
* Collect plants when fully grown
|
* Collect plant when fully grown
|
||||||
* If near water, farmland becomes wet and speeds up growth
|
* If near water, farmland becomes wet and speeds up growth
|
||||||
|
|
||||||
### Furnace
|
### Furnace
|
||||||
* Craft a furnace
|
* Craft furnace
|
||||||
* The furnace allows you to obtain more items
|
* Furnace allows you to obtain more items
|
||||||
* Upper slot must contain a smeltable item (example: iron ore)
|
* Upper slot must contain a smeltable item (example: iron ore)
|
||||||
* Lower slot must contain a fuel item (example: coal)
|
* Lower slot must contain a fuel item (example: coal)
|
||||||
* See tooltips in crafting guide to learn about fuels and smeltable items
|
* See tooltips in crafting guide to learn about fuels and smeltable items
|
||||||
|
@ -78,33 +78,35 @@ The MineClone2 repository is hosted at Mesehub. To contribute or report issues,
|
||||||
|
|
||||||
* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
|
* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
|
||||||
* Discord: <https://discord.gg/xE4z8EEpDC>
|
* Discord: <https://discord.gg/xE4z8EEpDC>
|
||||||
* YouTube: <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
|
* YouTube <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
|
||||||
|
* IRC: <https://web.libera.chat/#mineclone2>
|
||||||
|
* Matrix: <https://app.element.io/#/room/#mc2:matrix.org>
|
||||||
|
* Reddit: <https://www.reddit.com/r/MineClone2/>
|
||||||
|
* Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
|
||||||
* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
|
* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
|
||||||
* OpenCollective: <https://opencollective.com/mineclone2>
|
* OpenCollective: <https://opencollective.com/mineclone2>
|
||||||
* Mastodon: <https://fosstodon.org/@MineClone2>
|
|
||||||
* Lemmy: <https://lemmy.world/c/mineclone2>
|
|
||||||
* Matrix space: <https://app.element.io/#/room/#mcl2:matrix.org>
|
|
||||||
* Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
|
|
||||||
* Reddit: <https://www.reddit.com/r/MineClone2/>
|
|
||||||
* IRC (barely used): <https://web.libera.chat/#mineclone2>
|
|
||||||
|
|
||||||
## Target
|
## Target
|
||||||
- Create a stable, moddable, free/libre game based on Minecraft
|
- Crucially, create a stable, moddable, free/libre clone of Minecraft
|
||||||
on the Minetest engine with polished features, usable in both
|
based on the Minetest engine with polished features, usable in both
|
||||||
singleplayer and multiplayer. Currently, a lot of **Minecraft Java
|
singleplayer and multiplayer. Currently, a lot of **Minecraft Java
|
||||||
Edition** features are already implemented and polishing existing
|
Edition** features are already implemented and polishing existing
|
||||||
features are prioritized over new feature requests.
|
features are prioritized over new feature requests.
|
||||||
- Implement features targetting
|
- With lessened priority yet strictly, implement features targetting
|
||||||
**Current Minecraft versions + OptiFine** (OptiFine only as far as supported
|
**Current Minecraft versions + OptiFine** (OptiFine only as far as supported
|
||||||
by the Minetest Engine).
|
by the Minetest Engine). This means features in parity with the listed
|
||||||
- Create a performant experience that will run relatively
|
Minecraft experiences are prioritized over those that don't fulfill this
|
||||||
well on really low spec computers.
|
scope.
|
||||||
|
- Optionally, create a performant experience that will run relatively
|
||||||
|
well on really low spec computers. Unfortunately, due to Minecraft's
|
||||||
|
mechanisms and Minetest engine's limitations along with a very small
|
||||||
|
playerbase on low spec computers, optimizations are hard to investigate.
|
||||||
|
|
||||||
## Completion status
|
## Completion status
|
||||||
This game is currently in **beta** stage.
|
This game is currently in **beta** stage.
|
||||||
It is playable, but not yet feature-complete.
|
It is playable, but not yet feature-complete.
|
||||||
Backwards-compability is not entirely guaranteed, updating your world might cause small bugs.
|
Backwards-compability is not entirely guaranteed, updating your world might cause small bugs.
|
||||||
If you want to use the development version of MineClone2 in production, the master branch is usually relatively stable.
|
If you want to use the development version of MineClone2 in production, the master branch is usually relatively stable. The testing branch often features some experimental PRs and should be considered less stable.
|
||||||
|
|
||||||
The following main features are available:
|
The following main features are available:
|
||||||
|
|
||||||
|
@ -162,7 +164,7 @@ Bonus features (not found in Minecraft):
|
||||||
* Built-in crafting guide which shows you crafting and smelting recipes
|
* Built-in crafting guide which shows you crafting and smelting recipes
|
||||||
* In-game help system containing extensive help about gameplay basics, blocks, items and more
|
* In-game help system containing extensive help about gameplay basics, blocks, items and more
|
||||||
* Temporary crafting recipes. They only exist to make some otherwise unaccessible items available when you're not in creative mode. These recipes will be removed as development goes on an more features become available
|
* Temporary crafting recipes. They only exist to make some otherwise unaccessible items available when you're not in creative mode. These recipes will be removed as development goes on an more features become available
|
||||||
* Saplings in chests in [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
|
* Saplings in chests in mapgen v6
|
||||||
* Fully moddable (thanks to Minetest's powerful Lua API)
|
* Fully moddable (thanks to Minetest's powerful Lua API)
|
||||||
* New blocks and items:
|
* New blocks and items:
|
||||||
* Lookup tool, shows you the help for whatever it touches
|
* Lookup tool, shows you the help for whatever it touches
|
||||||
|
|
|
@ -1,45 +1,48 @@
|
||||||
# MineClone2
|
# MineClone2
|
||||||
Un jeu non-officiel similaire à Minecraft pour Minetest. Forké depuis Mineclone par davedevils. Développé par de nombreuses personnes. Pas développé ni supporté par Mojang AB.
|
Un jeu non-officiel similaire à Minecraft pour Minetest. Forké depuis Mineclone par davedevils. Développé par de nombreuses personnes. Ni développé ou supporté par Mojang AB.
|
||||||
|
|
||||||
|
Version: 0.79 (en dévelopment)
|
||||||
|
|
||||||
### Gameplay
|
### Gameplay
|
||||||
|
|
||||||
Vous atterissez dans un monde fait entièrement de cubes et généré aléatoirement. Vous pouvez explorer le monde, miner et construire presque n'importe quel bloc pour créer de nouvelles structures. Vous pouvez choisir de jouer en "mode survie" dans lequel vous devez combattre des monstres et la faim et progresser lentement dans différents aspects du jeu, comme l'extraction de minerai, l'agriculture, la construction de machines et ainsi de suite. Ou alors vous pouvez jouer en "mode créatif" où vous pouvez construire à peu près n'importe quoi instantanément.
|
Vous atterissez dans un monde fait entièrement de cubes et généré aléatoirement. Vous pouvez explorer le monde, miner et construire presque n'importe quel bloc pour créer de nouvelles structures. Vous pouvez choisir de jouer en "mode survie" dans lequel vous devez combattre des monstres et la faim et progresser lentement dans différents aspects du jeu, comme l'extraction de minerai, l'agriculture, la construction de machines et ainsi de suite. Ou alors vous pouvez jouer en "mode créatif" où vous pouvez construire à peu près n'importe quoi instantanément.
|
||||||
|
|
||||||
### Résumé du Gameplay
|
### Résumé du Gameplay
|
||||||
|
|
||||||
* Jeu de type bac-à-sable, sans objetifs
|
* Jeu de type bac-à-sable, sans objetifs
|
||||||
* Survie : combattez des monstres hostiles et la faim
|
* Survie : combattre des monstres hostiles et la faim
|
||||||
* Creusez pour du minerai et d'autres trésors
|
* Creuser pour du minerai et d'autres trésors
|
||||||
* Magie : gagnez de l'expérience et enchantez les outils
|
* Magie : gagner de l'expérience et enchanter les outils
|
||||||
* Utilisez les blocs ramassés pour construire de magnifiques bâtiments, votre imagination est la seule limite
|
* Utiliser les blocs ramassés pour construire de magnifiques bâtiments, votre imagination est la limite
|
||||||
* Ramassez des fleurs (et d'autres sources de teinture) et colorez votre monde
|
* Ramasser des fleurs (et d'autres sources de teinture) et colorez votre monde
|
||||||
* Trouvez des graines et commencez à cultiver
|
* Trouvez des graines et commencez à cultiver
|
||||||
* Trouvez ou fabriquez des centaines d'objets
|
* Trouvez ou fabriquez des centaines d'objets
|
||||||
* Construisez un réseau ferroviaire complexe et amusez-vous avec les wagonnets
|
* Construisez un réseau ferroviaire complexe et amusez vous avec les wagonnets
|
||||||
* En mode créatif vous pouvez construire presque n'importe quoi gratuitement et sans limite
|
* En mode créatif vous pouvez construire presque n'importe quoi gratuitement et sans limite
|
||||||
|
|
||||||
## Comment jouer (démarrer rapidement)
|
## Comment jouer (démarrer rapidement)
|
||||||
### Commencer
|
### Commencer
|
||||||
* **Frappez un arbre** jusqu'à ce qu'il casse et donne du bois
|
* **Frappez un arbre** jusqu'à ce qu'il casse et donne du bois
|
||||||
* Placez le **bois dans la grille 2x2** (la "grille de fabrication" de votre menu d'inventaire) et fabriquez 4 planches de bois
|
* Placez le **bois dans la grille 2x2** (la "grille de fabrication" de votre menu d'inventaire) et fabriquez 4 planches de bois
|
||||||
* Placer les 4 planches de bois dans la grille 2x2 et **fabriquez un établi**
|
* Placer les 4 planches de bois dans la grille 2x2 et **fabriquez une table d'artisanat**
|
||||||
* **Faites un clic droit sur l'établi** (icone livre) pour apprendre toutes les recettes possibles
|
* **Cliquez droit la table d'artisanat** (icone livre) pour apprendre toutes les recettes possibles
|
||||||
* **Fabriquez une pioche de bois** pour miner la pierre
|
* **Fabriquez une pioche de bois** pour miner la pierre
|
||||||
* Différents outils minent différentes sortes de blocs. Essayez-les !
|
* Différents outils minent différentes sortes de blocs. Essayez les !
|
||||||
* Continuez à jouer comme vous voulez. Amusez-vous !
|
* Continuez à jouer comme vous voulez. Amusez vous !
|
||||||
|
|
||||||
### Agriculture
|
### Agriculture
|
||||||
* Trouvez des graines
|
* Trouvez des graines
|
||||||
* Fabriquez une houe
|
* Fabriquez une houe
|
||||||
* Faites un clic droit sur la terre ou des blocs similaires avec la houe pour créer des terres agricoles
|
* Cliquez droit la terre ou des blocs similaires avec la houe pour créer des terres agricoles
|
||||||
* Placer des graines sur des terres agricoles et regardez les pousser
|
* Placer des graines sur des terres agricoles et regardez les pousser
|
||||||
* Récoltez les plantes une fois matûres
|
* Récoltez les plantes une fois matûres
|
||||||
* Les terres agricoles proche de l'eau deviennent humides et accélèrent la croissance
|
* Les terres agricoles proche de l'eau deviennent humides et accélèrent la croissance
|
||||||
|
|
||||||
### Four
|
### Four
|
||||||
* Fabriquez un four
|
* Fabriquer un Four
|
||||||
* Le four permet d'obtenir plus d'objets
|
* Le four permet d'obtenir plus d'objets
|
||||||
* L'emplacement du haut doit contenir un objet fondable (par ex : minerai de fer)
|
* L'emplacement du haut doit contienir un objet fondable (par ex : minerai de fer)
|
||||||
* L'emplacement du bas doit contenir un objet combustible (par ex : charbon)
|
* L'emplacement du bas doit contienir un objet combustible (par ex : charbon)
|
||||||
* Voir le guide d'artisanat pour en apprendre plus sur les objets fondables et combustibles
|
* Voir le guide d'artisanat pour en apprendre plus sur les objets fondables et combustibles
|
||||||
|
|
||||||
### Aide supplémentaire
|
### Aide supplémentaire
|
||||||
|
@ -59,43 +62,43 @@ Il n'y a pas de support de MineClone2 dans les versions développement de Minete
|
||||||
Pour installer MineClone2 (si ce n'est pas déjà fait), déplacez ce dossier dans le dossier “games” de Minetest. Consultez l'aide de Minetest pour en apprendre plus.
|
Pour installer MineClone2 (si ce n'est pas déjà fait), déplacez ce dossier dans le dossier “games” de Minetest. Consultez l'aide de Minetest pour en apprendre plus.
|
||||||
|
|
||||||
## Liens utiles
|
## Liens utiles
|
||||||
Le dépôt de MineClone2 est hébergé sur Mesehub. Pour contribuer ou signaler des problèmes, allez là-bas.
|
Le dépôt de MineClone2 est hébergé sur Mesehub. Pour contribuer ou rapporter des problèmes, aller là-bas.
|
||||||
|
|
||||||
* Mesehub : <https://git.minetest.land/MineClone2/MineClone2>
|
* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
|
||||||
* Discord : <https://discord.gg/xE4z8EEpDC>
|
* Discord: <https://discord.gg/xE4z8EEpDC>
|
||||||
* YouTube : <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
|
* YouTube <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
|
||||||
* IRC : <https://web.libera.chat/#mineclone2>
|
* IRC: <https://web.libera.chat/#mineclone2>
|
||||||
* Matrix : <https://app.element.io/#/room/#mc2:matrix.org>
|
* Matrix: <https://app.element.io/#/room/#mc2:matrix.org>
|
||||||
* Reddit : <https://www.reddit.com/r/MineClone2/>
|
* Reddit: <https://www.reddit.com/r/MineClone2/>
|
||||||
* Forums Minetest : <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
|
* Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
|
||||||
* ContentDB : <https://content.minetest.net/packages/wuzzy/mineclone2/>
|
* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
|
||||||
* OpenCollective : <https://opencollective.com/mineclone2>
|
* OpenCollective: <https://opencollective.com/mineclone2>
|
||||||
|
|
||||||
## Objectif
|
## Objectif
|
||||||
* Essentiellement, créer un clone de Minecraft stable, moddable, libre et gratuit basé sur le moteur de jeu Minetest avec des fonctionnalités abouties, utilisable à la fois en mode solo et multijoueur. Actuellement, beaucoup des fonctionnalités de **Minecraft Java Edition** sont déjà implémentées et leur amélioration est prioritaire sur les nouvelles demandes.
|
* Créer un clone stable, moddable, libre et gratuit basé sur le moteur de jeu Minetest avec des fonctionalités abouties, utilisable à la fois en mode solo et multijoueur. Actuellement, beaucoup des fonctionalités de **Minecraft Java Edition** sont déjà implémentées et leur amélioration est prioritaire sur les nouvelles demandes.
|
||||||
* Avec une priorité moindre, implémenter les fonctionnalités des versions **Minecraft + OptiFine** (OptiFine autant que supporté par le moteur Minetest). Cela signifie que les fonctionnalités présentes dans les versions listées sont priorisées.
|
* Avec une priorité moindre, implémenter les fonctionalités des versions **Minecraft + OptiFine** (OtiFine autant que supporté par le moteur Minetest). Cela signifie que les fonctionalités présentes dans les versions listées sont priorisées.
|
||||||
* Dans l'idéal, créer une expérience performante qui tourne bien sur des ordinateurs à basse performance. Malheureusement, en raison des mécanismes de Minecraft et des limitations du moteur Minetest ainsi que de la petite taille de la communauté de joueurs sur des ordinateurs à basses performances, les optimisations sont difficiles à explorer.
|
* Dans l'idéal, créer une expérience performante qui tourne bien sur des ordinateurs à basse performance. Malheureusement, en raison des mécanismes de Minecraft et des limitations du moteur Minetest ainsi que de la petite taille de la communauté de joueurs sur des ordinateurs à basse performances, les optimisations sont difficiles à explorer.
|
||||||
|
|
||||||
## Statut de complétion
|
## Statut de complétion
|
||||||
Ce jeu est actuellement au stade **beta**.
|
Ce jeu est actuellement au stade **beta**.
|
||||||
Il est jouable mais incomplet en fonctionnalités.
|
Il est jouable mais incomplet en fonctionalités.
|
||||||
La rétro-compatibilité n'est pas entièrement garantie, mettre votre monde à jour peut causer de petits bugs.
|
La rétro-compatibilité n'est pas entièrement garantie, mettre votre monde à jour peut causer de petits bugs.
|
||||||
Si vous voulez utiliser la version de développement de MineClone2 en production, la branche master est habituellement relativement stable. Les branches de test fusionnent souvent des pull requests expérimentales et doivent être considérées comme moins stable.
|
Si vous voulez utiliser la version de développement de MineClone2 en production, la branche master est habituellement relativement stable. Les branches de test fusionnent souvent des pull requests expérimentales et doivent être considérées comme moins stable.
|
||||||
|
|
||||||
Les principales fonctionnalités suivantes sont disponibles :
|
Les principales fonctionalités suivantes sont disponibles :
|
||||||
|
|
||||||
* Outils, armes
|
* Outils, armes
|
||||||
* Armure
|
* Armure
|
||||||
* Système de fabrication : grille 2x2, établi (grille 3x3), four, incluant un guide de fabrication
|
* Système de fabrication : grille 2x2, table d'artisanat (grille 3x3), four, incluant un guide de fabrication
|
||||||
* Coffres, grands coffres, coffre ender, boites de Shulker
|
* Coffres, grands coffres, coffre ender, boite de shulker
|
||||||
* Fours, entonnoirs
|
* Fours, entonnoirs
|
||||||
* Faim
|
* Faim
|
||||||
* La plupart des monstres et animaux
|
* La plupart des monstres et animaux
|
||||||
* Tous les minerais de Minecraft
|
* Tout les minerais de Minecraft
|
||||||
* La plupart des blocs de l'overworld
|
* La plupart des blocs de l'overworld
|
||||||
* Eau et lave
|
* Eau et lave
|
||||||
* Météo
|
* Météo
|
||||||
* 28 biomes + 5 biomes du Nether
|
* 28 biomes + 5 biomes du nether
|
||||||
* Le Nether, monde souterrain brûlant dans une autre dimension
|
* Le Nether, monde souterrain brûlant dans une autre dimension
|
||||||
* Circuits Redstone (partiel)
|
* Circuits Redstone (partiel)
|
||||||
* Effets de Statut (partiel)
|
* Effets de Statut (partiel)
|
||||||
|
@ -104,10 +107,10 @@ Les principales fonctionnalités suivantes sont disponibles :
|
||||||
* Brassage, potions, flèches trempées (partiel)
|
* Brassage, potions, flèches trempées (partiel)
|
||||||
* Bâteaux
|
* Bâteaux
|
||||||
* Feu
|
* Feu
|
||||||
* Blocs de construction : escaliers, dalles, portes, trappes, barrières, portillons, murets
|
* Blocs de construction : escaliers, dalles, portes, trappes, barrière, portillon, muret
|
||||||
* Horloge
|
* Horloge
|
||||||
* Boussole
|
* Boussole
|
||||||
* Éponge
|
* Eponge
|
||||||
* Bloc de slime
|
* Bloc de slime
|
||||||
* Petites plantes et pousses
|
* Petites plantes et pousses
|
||||||
* Teintures
|
* Teintures
|
||||||
|
@ -115,30 +118,26 @@ Les principales fonctionnalités suivantes sont disponibles :
|
||||||
* Blocs de décoration : verre, verre teinté, vitres, barres de fer, terre cuites (et couleurs), têtes et plus
|
* Blocs de décoration : verre, verre teinté, vitres, barres de fer, terre cuites (et couleurs), têtes et plus
|
||||||
* Cadres d'objets
|
* Cadres d'objets
|
||||||
* Juke-boxes
|
* Juke-boxes
|
||||||
* Lits
|
|
||||||
* Menu d'inventaire
|
|
||||||
* Inventaire créatif
|
|
||||||
* Agriculture
|
|
||||||
* Livres pour écrire
|
* Livres pour écrire
|
||||||
* Commandes
|
* Commandes
|
||||||
* Villages
|
* Villages
|
||||||
* L'End
|
* L'End
|
||||||
* et plus !
|
* et plus !
|
||||||
|
|
||||||
Les fonctionnalités suivantes sont incomplètes :
|
Les fonctionalités suivantes sont incomplètes :
|
||||||
|
|
||||||
* Certains monstres et animaux
|
* certains monstres et animaux
|
||||||
* Certains composants de Redstone
|
* certains composants de Redstone
|
||||||
* Wagonnets spéciaux
|
* Wagonnets spéciaux
|
||||||
* Quelques blocs et objets non-triviaux
|
* quelques blocs et objets non-triviaux
|
||||||
|
|
||||||
Fonctionnalités bonus (absentes de Minecraft) :
|
Fonctionalités bonus (absentes de Minecraft) :
|
||||||
|
|
||||||
* Guide d'artisanat intégré au jeu qui montre les recettes d'artisanat et de cuisson
|
* Guide d'artisanat intégré au jeu qui montre les recettes d'artisanat et de cuisson
|
||||||
* Système d'aide intégré au jeu contenant des informations à propos des techniques de base, blocs, objets et plus
|
* Système d'aide intégré au jeu contenant des informations à propos des techniques de base, blocs, objets et plus
|
||||||
* Recettes d'artisanat temporaires. Elles existent uniquement pour rendre des objets accessibles qui ne le seraient pas autrement sauf en mode créatif. Elles seront retirées au cours de l'avancement du développement et de l'ajout de nouvelles fonctionnalités.
|
* Recettes d'artisanat temporaires. Elles existent uniquement pour rendre des objets accessibles qui ne le seraient pas autrement sauf en mode créatif. Elles seront retirées au cours de l'avancement du développement et de l'ajout de nouvelles fonctionalités.
|
||||||
* Pousses dans les coffres en [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
|
* Pousses dans les coffres en mapgen v6
|
||||||
* Entièrement moddable (grâce la puissante API Lua de Minetest)
|
* Entièrement moddable (grâce la puissante API lua de Minetest)
|
||||||
* Nouveaux blocs et objets :
|
* Nouveaux blocs et objets :
|
||||||
* Outil de recherche, montre l'aide de ce qu'il touche
|
* Outil de recherche, montre l'aide de ce qu'il touche
|
||||||
* Plus de dalles et d'escaliers
|
* Plus de dalles et d'escaliers
|
||||||
|
@ -150,24 +149,22 @@ Fonctionnalités bonus (absentes de Minecraft) :
|
||||||
* Avant-poste du Nether (Forteresse)
|
* Avant-poste du Nether (Forteresse)
|
||||||
|
|
||||||
Différences techniques avec Minecraft :
|
Différences techniques avec Minecraft :
|
||||||
|
|
||||||
* Limite en hauteur de 31000 blocs (bien plus grand que Minecraft)
|
* Limite en hauteur de 31000 blocs (bien plus grand que Minecraft)
|
||||||
* Taille horizontale du monde 62000×62000 blocs (bien plus petit que Minecraft mais toujours très grand)
|
* Taille horizontale du monde 62000×62000 blocs (bien plus petit que Minecraft mais toujours très grand)
|
||||||
* Toujours assez incomplet et buggé
|
* Toujours assez incomplet et buggé
|
||||||
* Des blocs, objets, ennemis et fonctionnalités manquent
|
* Des blocs, objets, ennemis et fonctionalités manquent
|
||||||
* Quelques objets ont des noms légèrement différents pour être plus faciles à distinguer
|
* Quelques objets ont des noms légèrement différents pour être plus faciles à distinguer
|
||||||
* Des musiques différentes pour le juke-boxe
|
* Des musiques différentes pour le juke-boxe
|
||||||
* Des textures différentes (Pixel Perfection)
|
* Des textures différentes (Pixel Perfection)
|
||||||
* Des sons différents (sources diverses)
|
* Des sons différents (sources diverses)
|
||||||
* Un moteur de jeu différent (Minetest)
|
* Un moteur de jeu différent (Minetest)
|
||||||
* Des bonus cachés différents
|
* Des bonus cachés différents
|
||||||
|
|
||||||
...et enfin MineClone2 est un logiciel libre !
|
...et enfin MineClone2 est un logiciel libre !
|
||||||
|
|
||||||
## Autres fichiers readme
|
## Autres fichiers readme
|
||||||
|
|
||||||
* `LICENSE.txt` : Le texte de la licence GPLv3
|
* `LICENSE.txt`: Le texte de la license GPLv3
|
||||||
* `CONTRIBUTING.md` : Information pour ceux qui veulent contribuer
|
* `CONTRIBUTING.md`: Information pour ceux qui veulent contribuer
|
||||||
* `API.md` : Pour les modders Minetest qui veulent modder ce jeu
|
* `API.md`: Pour les modders Minetest qui veulent modder ce jeu
|
||||||
* `LEGAL.md` : Information légale
|
* `LEGAL.md`: Information légale
|
||||||
* `CREDITS.md` : Liste de toutes les personnes qui ont contribué
|
* `CREDITS.md`: Liste des contributeurs
|
|
@ -1,193 +0,0 @@
|
||||||
# MineClone2
|
|
||||||
Неофициальная игра в стиле Minecraft для Minetest. Форк MineClone от davedevils.
|
|
||||||
Разработана многими людьми. Не разработана и не одобрена Mojang AB.
|
|
||||||
|
|
||||||
### Игровой процесс
|
|
||||||
Вы начинаете в случайно сгенерированном мире созданном целиком из кубов. Вы можете
|
|
||||||
исследовать мир, выкопать и поставить почти каждый блок в мире, чтобы создавать новые
|
|
||||||
структуры. Вы можете играть в “режиме выживания” в котором вам придется бороться с
|
|
||||||
монстрами и голодом за выживание и медленно проходить через различные аспекты игры,
|
|
||||||
такие как копание, фермерство, постройка механизмов и так далее. Или вы можете играть
|
|
||||||
в “творческом режиме” в котором вы сразу можете строить что угодно.
|
|
||||||
|
|
||||||
#### Итоги геймплея
|
|
||||||
|
|
||||||
* Геймплей в стиле песочницы, без целей
|
|
||||||
* Выживайте: сражайтесь с враждебными монстрами и голодом
|
|
||||||
* Добывайте руды и прочие ценные предметы
|
|
||||||
* Магия: получайте опыт и зачаруйте ваше снаряжение
|
|
||||||
* Создавайте из собранных блоков величественные постройки ограниченные только воображением
|
|
||||||
* Собирайте цветы и другие красители, чтобы раскрасить ваш мир
|
|
||||||
* Найдите семена и заведите ферму
|
|
||||||
* Найдите или создайте один из сотен предметов
|
|
||||||
* Проложите рельсы и повеселитесь с вагонетками
|
|
||||||
* Постройте сложные механизмы со схемами из редстоуна
|
|
||||||
* В творческом режиме вы можете свободно строить всё без лимитов
|
|
||||||
|
|
||||||
## Как играть (быстрый старт)
|
|
||||||
### Начнем
|
|
||||||
|
|
||||||
* **Бейте по стволу дерева** пока оно не сломается и соберите древесину
|
|
||||||
* Поставьте **древесину в сетку 2×2** (“сетка крафта” в вашем инвентаре) и скрафтите 4 доски
|
|
||||||
* Разложите 4 доски в форме 2×2 в сетке крафта, чтобы **сделать верстак**
|
|
||||||
* **Правым кликом по верстаку**, чтобы открыть сетку крафта 3×3 для более сложных предметов
|
|
||||||
* Используйте **книгу рецептов** (иконка книги), чтобы узнать все возможные рецепты крафтов
|
|
||||||
* **Скрафтите деревянную кирку**, чтобы вы могли копать камень
|
|
||||||
* Разные инструменты добывают разные виды блоков. Опробуйте их все!
|
|
||||||
* Продолжайте играть как пожелаете. Повеселитесь!
|
|
||||||
|
|
||||||
### Фермерство
|
|
||||||
* Найдите семена
|
|
||||||
* Скрафтите мотыгу
|
|
||||||
* Правой кнопкой мотыгой по земле или похожему блоку, чтобы создать грядку
|
|
||||||
* Посадите семена на грядку и ждите пока они вырастут
|
|
||||||
* Соберите растение когда оно полностью созреет
|
|
||||||
* Рядом с водой грядка становится влажной и растения растут быстрее
|
|
||||||
|
|
||||||
### Переплавка
|
|
||||||
* Скрафтите печь
|
|
||||||
* Печь позволит вам получить больше предметов
|
|
||||||
* Верхний слот должен содержать переплавляемый предмет (например: железную руду)
|
|
||||||
* Нижний слот должен содержать топливо (например: уголь)
|
|
||||||
* Смотрите книгу рецептов, чтобы узнать о других переплавляемых предметах и топливе
|
|
||||||
|
|
||||||
### Дополнительная помощь
|
|
||||||
Больше информации о геймплее, блоках, предметах и многое другое можно найти во
|
|
||||||
внутриигровой справке. Вы можете перейти в неё через ваш инвентарь.
|
|
||||||
|
|
||||||
### Особые предметы
|
|
||||||
Следующие предметы интересны для творческого режима и для строителей приключенческих
|
|
||||||
карт. Их нельзя получить в игре или через творческий инвентарь.
|
|
||||||
|
|
||||||
* Барьер: `mcl_core:barrier`
|
|
||||||
|
|
||||||
Используйте чат-команду `/giveme`, чтобы получить их.
|
|
||||||
Смотрите справку для дальнейшей информации.
|
|
||||||
|
|
||||||
## Установка
|
|
||||||
Эта игра требует [Minetest](http://minetest.net) для запуска (версия 5.4.1 или
|
|
||||||
выше). Вам нужно сперва установить Minetest. Только стабильные версии поддерживаются
|
|
||||||
официально. Не поддерживается запуск MineClone2 на разрабатываемых версиях Minetest.
|
|
||||||
|
|
||||||
Чтобы установить MineClone2 (если вы этого еще не сделали), переместите эту папку в
|
|
||||||
“games” в папке данных Minetest. Смотрите справку Minetest, чтобы узнать больше.
|
|
||||||
|
|
||||||
## Полезные ссылки
|
|
||||||
Репозиторий MineClone2 хранится на Mesehub. Зайдите туда, чтобы оставить запрос или
|
|
||||||
поучаствовать в разработке.
|
|
||||||
|
|
||||||
* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
|
|
||||||
* Discord: <https://discord.gg/xE4z8EEpDC>
|
|
||||||
* YouTube: <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
|
|
||||||
* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
|
|
||||||
* OpenCollective: <https://opencollective.com/mineclone2>
|
|
||||||
* Mastodon: <https://fosstodon.org/@MineClone2>
|
|
||||||
* Lemmy: <https://lemmy.world/c/mineclone2>
|
|
||||||
* Matrix space: <https://app.element.io/#/room/#mcl2:matrix.org>
|
|
||||||
* Форум Minetest: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
|
|
||||||
* Reddit: <https://www.reddit.com/r/MineClone2/>
|
|
||||||
* IRC (едва используется): <https://web.libera.chat/#mineclone2>
|
|
||||||
|
|
||||||
## Цели
|
|
||||||
- Создать стабильную, модифицируемую, бесплатную и свободную игру основанную на
|
|
||||||
Minecraft на движке Minetest с проработанными возможностями для одиночной игры и
|
|
||||||
для мультиплеера. На данный момент множество возможностей **Minecraft Java
|
|
||||||
Edition** уже реализовано и доработка имеющегося контента в приоритете над
|
|
||||||
добавлением нового.
|
|
||||||
- Реализовать возможности на уровне **текущей версии Minecraft + OptiFine** (OptiFine
|
|
||||||
настолько, насколько это поддерживается движком Minetest).
|
|
||||||
- Добиться производительности для запуска на действительно слабых компьютерах.
|
|
||||||
|
|
||||||
## Готовность
|
|
||||||
Игра сейчас на стадии **бета**. Она играбельна, но еще не имеет всех возможностей.
|
|
||||||
Обратная совместимость целиком не гарантируется, обновление вашего мира может повлечь
|
|
||||||
за собой небольшие ошибки. Если вы хотите использовать разрабатываемую версию
|
|
||||||
Mineclone2, то ветка master обычно относительно стабильна.
|
|
||||||
|
|
||||||
Следущие возможности уже доступны:
|
|
||||||
|
|
||||||
* Инструменты, оружие, броня
|
|
||||||
* Система крафта: сетка 2×2, верстак (сетка 3×3) и книга рецептов
|
|
||||||
* Сундуки, большие сундуки, эндер-сундуки, ящики шалкера
|
|
||||||
* Печи и воронки
|
|
||||||
* Система голода
|
|
||||||
* Большинство монстров и животных
|
|
||||||
* Все руды из Minecraft
|
|
||||||
* Большинство блоков из Верхнего мира
|
|
||||||
* Вода и лава
|
|
||||||
* Погода
|
|
||||||
* 28 биомов + 5 биомов в Незере
|
|
||||||
* Незер, пылающий подземный мир в другом измерении
|
|
||||||
* Схемы из редстоуна (частично)
|
|
||||||
* Вагонетки (частично)
|
|
||||||
* Статусные эффекты (частично)
|
|
||||||
* Опыт
|
|
||||||
* Зачарование
|
|
||||||
* Зельеварение, зелья, смоченные стрелы (частично)
|
|
||||||
* Лодки
|
|
||||||
* Огонь
|
|
||||||
* Строительные блоки: ступени, плиты, двери, люки, заборы, калитки, стены
|
|
||||||
* Часы
|
|
||||||
* Компас
|
|
||||||
* Губки
|
|
||||||
* Блоки слизи
|
|
||||||
* Растения и саженцы
|
|
||||||
* Красители
|
|
||||||
* Флаги
|
|
||||||
* Декоративные блоки: стекло, окрашенное стекло, стеклянные панели, железные решетки, цветная керамика, головы и многое другое
|
|
||||||
* Рамки для предметов
|
|
||||||
* Прогрыватели
|
|
||||||
* Кровати
|
|
||||||
* Меню инвентаря
|
|
||||||
* Творческий инвентарь
|
|
||||||
* Фермерство
|
|
||||||
* Книги с пером
|
|
||||||
* Команды
|
|
||||||
* Деревни
|
|
||||||
* Измерение Края
|
|
||||||
* И многое другое!
|
|
||||||
|
|
||||||
Следующие возможности еще не завершены:
|
|
||||||
|
|
||||||
* Некоторые монстры и животные
|
|
||||||
* Предметы связанные с редстоуном
|
|
||||||
* Некоторые вагонетки (с сундуком и с воронкой уже работают)
|
|
||||||
* Пара нетривиальных блоков и предметов
|
|
||||||
|
|
||||||
Бонусные возможности (нет в Minecraft-е):
|
|
||||||
|
|
||||||
* Встроенный гайд для крафта покажет вам рецепты крафта и переплавки
|
|
||||||
* Внутриигровая справка содержит всестороннюю информацию об основах игры, блоках, предметах и прочее
|
|
||||||
* Временные рецепты крафта. Они существуют, чтобы получить доступ к ранее недоступным предметам вне творческого режима. Они будут удалены как только разработка позволит им стать доступными
|
|
||||||
* Саженцы в сундуках в [mapgen v6](https://wiki.minetest.net/Map_generator#v6)
|
|
||||||
* Полностью модифицируема (благодаря мощному Lua API в Minetest)
|
|
||||||
* Новые блоки и предметы:
|
|
||||||
* Инструмент просмотра покажет справку о том чего коснется
|
|
||||||
* Больше ступеней и плит
|
|
||||||
* Калитки и заборы из адских кирпичей
|
|
||||||
* Замены структур - малые верии структур из Minecraft пока большие структуры не будут сделаны:
|
|
||||||
* Лесная хижина (Особняк)
|
|
||||||
* Форт Незера (Крепости)
|
|
||||||
|
|
||||||
Технические отличия от Minecraft:
|
|
||||||
|
|
||||||
* Лимит высоты - 31000 блоков (намного больше чем в Minecraft)
|
|
||||||
* Горизонтальный размер мира - 62000×62000 блоков (намного меньше чем в Minecraft, но всё еще очень большой)
|
|
||||||
* Всё еще не завершен и содержит много багов
|
|
||||||
* Недостающие блоки, предметы, мобы
|
|
||||||
* Некоторые предметы с другими названиями, чтобы лучше их различать
|
|
||||||
* Другая музыка для проигрывателей
|
|
||||||
* Другие текстуры (Pixel Perfection)
|
|
||||||
* Другие звуки (разные источники)
|
|
||||||
* Другой движок (Minetest)
|
|
||||||
* Другие пасхалки
|
|
||||||
|
|
||||||
… и наконец, MineClone2 это свободное программное обеспечение!
|
|
||||||
|
|
||||||
## Другие readme файлы
|
|
||||||
|
|
||||||
* `LICENSE.txt`: текст лицензии GPLv3
|
|
||||||
* `CONTRIBUTING.md`: информация для тех кто хочет поучаствовать в разработке
|
|
||||||
* `API.md`: для моддеров Minetest кто хочет изменить эту игру
|
|
||||||
* `LEGAL.md`: юридическая информация
|
|
||||||
* `CREDITS.md`: список участников проекта
|
|
83
RELEASE.md
83
RELEASE.md
|
@ -1,11 +1,8 @@
|
||||||
### Standard Release
|
#File to document release steps with a view to evolving into a script
|
||||||
|
|
||||||
# File to document release steps with a view to evolving into a script
|
#Update CREDITS.md
|
||||||
|
#Update version in game.conf
|
||||||
|
|
||||||
# Update CREDITS.md
|
|
||||||
# Update version in game.conf
|
|
||||||
|
|
||||||
```
|
|
||||||
lua tools/generate_ingame_credits.lua
|
lua tools/generate_ingame_credits.lua
|
||||||
|
|
||||||
git add CREDITS.md
|
git add CREDITS.md
|
||||||
|
@ -14,76 +11,12 @@ git add game.conf
|
||||||
|
|
||||||
#git add RELEASE.md
|
#git add RELEASE.md
|
||||||
|
|
||||||
git commit -m "Pre-release update credits and set version 0.83.0"
|
git commit -m "Pre-release update credits and set version 0.82.0"
|
||||||
|
|
||||||
git tag 0.83.0
|
git tag 0.82.0
|
||||||
|
|
||||||
git push origin 0.83.0
|
git push origin 0.82.0
|
||||||
```
|
|
||||||
|
|
||||||
# Update version in game.conf to the next version with -SNAPSHOT suffix
|
#Update version in game.conf to -SNAPSHOT
|
||||||
|
|
||||||
`git commit -m "Post-release set version 0.84.0-SNAPSHOT"`
|
git commit -m "Post-release set version 0.82.0-SNAPSHOT"
|
||||||
|
|
||||||
### Hotfix Release
|
|
||||||
|
|
||||||
##### Prepare release branch
|
|
||||||
|
|
||||||
When hotfixing, you should never release new features. Any new code increases risk of new bugs which has additional testing/release concerns.
|
|
||||||
To mitigate this, you just release the last release, and the relevant bug fix. For this, we do the following:
|
|
||||||
|
|
||||||
* Create release branch from the last release tag, push it:
|
|
||||||
|
|
||||||
```
|
|
||||||
git checkout -b release/0.82.1 0.82.0
|
|
||||||
|
|
||||||
git push origin release/0.82.1
|
|
||||||
```
|
|
||||||
|
|
||||||
##### Prepare feature branch and fix
|
|
||||||
|
|
||||||
* Create feature branch from that release branch (can review it to check only fix is there, nothing else, and use to also merge into master separately)
|
|
||||||
|
|
||||||
`git checkout -b hotfix_bug_1_branch`
|
|
||||||
|
|
||||||
* Fix crash/serious bug and commit
|
|
||||||
* Push branch and create pr to the release and also the master branch (Do not rebase, to reduce merge conflict risk. Do not delete after first merge or it needs to be repushed)
|
|
||||||
|
|
||||||
##### Update version and tag the release
|
|
||||||
|
|
||||||
* After all fixes are in release branch, pull it locally (best to avoid a merge conflict as feature branch will need to be merged into master also, which already changed version):
|
|
||||||
|
|
||||||
* Update version in game.conf to hotfix version and commit it. Example: version=0.82.1
|
|
||||||
|
|
||||||
* Tag it, push tag and branch:
|
|
||||||
|
|
||||||
```
|
|
||||||
git tag 0.82.1
|
|
||||||
|
|
||||||
git push origin 0.82.1
|
|
||||||
|
|
||||||
git push origin release/0.82.1
|
|
||||||
```
|
|
||||||
|
|
||||||
Note: If you have to do more than 1 hotfix release, can do it on the same release branch.
|
|
||||||
|
|
||||||
### Release via ContentDB
|
|
||||||
|
|
||||||
* Go to MineClone2 page (https://content.minetest.net/packages/Wuzzy/mineclone2/)
|
|
||||||
* Click +Release
|
|
||||||
* Enter the release tag number in the title and Git reference box. For example (without quotes): "0.82.1"
|
|
||||||
* In the minimum minetest version, put the oldest supported version (as of 14/02/2023 it is 5.5), leave the Maximum minetest version blank
|
|
||||||
* Click save. Release is now live.
|
|
||||||
|
|
||||||
##### Inform people
|
|
||||||
|
|
||||||
* Upload video to YouTube
|
|
||||||
* Add a comment to the forum post with the release number and change log. Maintainer will update main post with code link.
|
|
||||||
* Add a Discord announcement post and @everyone with link to video, forum post and release notes.
|
|
||||||
* Share the news on reddit + Lemmy. Good subs to share with:
|
|
||||||
* r/linux_gaming
|
|
||||||
* r/opensourcegames
|
|
||||||
* r/opensource
|
|
||||||
* r/freesoftware
|
|
||||||
* r/linuxmasterrace
|
|
||||||
* r/MineClone2
|
|
57
TEXTURES.md
57
TEXTURES.md
|
@ -1,57 +0,0 @@
|
||||||
# Making Textures In Mineclone2
|
|
||||||
|
|
||||||
Textures are a crucial asset for all items, nodes, and models in mineclone2. This document is for artist who would like to make and modify textures for mineclone2. While no means comprehensive, this document contains the basic important information for beginners to get started with texture curation and optimization.
|
|
||||||
|
|
||||||
## Minetest Wiki
|
|
||||||
For more detailed information on creating and modifing texture packs for Minetest/Mineclone2, please visit the Minetest wiki's page on creating a texture pack. Click [here](https://wiki.minetest.net/Creating_texture_packs) to view the wiki page on creating texture packs.
|
|
||||||
|
|
||||||
## GIMP Tutorials Pixel Art Guide
|
|
||||||
GIMP Tutorials has an excellent guide to making pixel art in GIMP. If you would like further clarification as well as screenshots for what we are about to cover, it is an excellent resource to turn to. Click [here](https://thegimptutorials.com/how-to-make-pixel-art/) to view the guide
|
|
||||||
|
|
||||||
## Recommended Software
|
|
||||||
|
|
||||||
### GIMP
|
|
||||||
|
|
||||||
GIMP (GNU Image Manipulation Program) is a very popular and free image editing software supported on Windows, MacOS, and most Linux distributions. It is recommended to use GIMP to create and modify textures within the minetest engine.
|
|
||||||
|
|
||||||
Download GIMP [here](http://gimp.org/)
|
|
||||||
|
|
||||||
# Getting Started
|
|
||||||
## Creating a new file
|
|
||||||
the first thing to do is open GIMP and create a new file to work in by opening the File menu and choosing "New".
|
|
||||||
|
|
||||||
Choose width of 16 and height of 16 for the image size. While higher resolution textures are possible, The default size is 16x16. It is recommended you use this size as well, as it is universally supported on all systems.
|
|
||||||
|
|
||||||
## Zoom In
|
|
||||||
Next, you'll want to zoom in as the canvas is very small at the default zoom level. To do this either use CTRL + mousewheel, +/-, or navigate to the View menu > zoom > zoom in
|
|
||||||
|
|
||||||
## Configure Grid
|
|
||||||
Now, we'll want to turn on the grid. Open the edit menu and enable the 'show grid' option.
|
|
||||||
|
|
||||||
The default grid size is 10 pixels, we want to change it to a 1 pixel grid. Go to the Image menu and choose 'configure grid.
|
|
||||||
|
|
||||||
In the Spacing section, change both the Horizontal and Vertical pixel settings to 1.00 then click ok and the grid will update.
|
|
||||||
|
|
||||||
## Pencil Tool & Color Picking
|
|
||||||
The most useful brush type for pixel art is the Pencil tool. Its nested under the paintbrush tool in the toolbox, or you can use the keyboard shortcut 'N'.
|
|
||||||
|
|
||||||
Once the pencil tool is selected, navigate to the sliders on the left side of the canvas and change brush size to 1 pixel.
|
|
||||||
|
|
||||||
Now choose a color! You can do this by clicking on the two colored squares under the toolbox. The Color Picker tool is also a good option if you already have a reference image for color palette.
|
|
||||||
|
|
||||||
## How to export optimally
|
|
||||||
|
|
||||||
Once you have finished up a texture and are ready to export it, navigate to the file menu > export as... and make sure the file name extention is .png
|
|
||||||
|
|
||||||
After clicking 'Export', a menu will appear with a bunch of options checked. Make sure to uncheck all of these options!!! This will drastically reduce the file size from multiple kilobytes to a couple of hundred bytes. Finally click 'Export' one more time.
|
|
||||||
|
|
||||||
### Further optimization with OptiPNG
|
|
||||||
For those running a GNU/linux distribution, you most likely have the 'optipng' command available to you. If it does not come with your system by default, the software homepage can be found [here](https://optipng.sourceforge.net/) where you can download and install from source.
|
|
||||||
|
|
||||||
First, Open up the terminal in the directory where your exported texture is located (or navigate to the directory with the 'cd your/directory/path/to/textures'), then run this command
|
|
||||||
```
|
|
||||||
optipng -o7 -zm1-9 -nc -clobber -strip all *.png
|
|
||||||
```
|
|
||||||
This will further optimize all the textures in the directory.
|
|
||||||
|
|
||||||
NOTE: If you would like to further edit a texture that has been optipng'd in GIMP, you must manually set the color palette back to RBG after opening. Navigate to Image menu > Mode > select RGB
|
|
|
@ -1 +1 @@
|
||||||
A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more.
|
A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more. Faithful clone of Minecraft 1.12. This is a work in progress! Expect bugs!
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
title = MineClone 2
|
title = MineClone 2
|
||||||
description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.
|
description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.
|
||||||
disallowed_mapgens = v6
|
disallowed_mapgens = v6
|
||||||
version=0.85.0-SNAPSHOT
|
version=0.82.0-SNAPSHOT
|
BIN
menu/footer.png
BIN
menu/footer.png
Binary file not shown.
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.4 KiB |
|
@ -215,10 +215,6 @@ function mcl_autogroup.can_harvest(nodename, toolname, player)
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
if minetest.get_item_group(nodename, "dig_immediate_piston") >= 1 then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Check if it can be dug by tool
|
-- Check if it can be dug by tool
|
||||||
local tdef = minetest.registered_tools[toolname]
|
local tdef = minetest.registered_tools[toolname]
|
||||||
if tdef and tdef._mcl_diggroups then
|
if tdef and tdef._mcl_diggroups then
|
||||||
|
@ -304,10 +300,6 @@ end
|
||||||
-- loading order.
|
-- loading order.
|
||||||
function mcl_autogroup.get_wear(toolname, diggroup)
|
function mcl_autogroup.get_wear(toolname, diggroup)
|
||||||
local tdef = minetest.registered_tools[toolname]
|
local tdef = minetest.registered_tools[toolname]
|
||||||
if not tdef then
|
|
||||||
minetest.log("warning", "Adding wear for tool: " .. tostring(toolname) .. " failed with diggroup: " .. tostring(diggroup))
|
|
||||||
return nil
|
|
||||||
end
|
|
||||||
local uses = tdef._mcl_diggroups[diggroup].uses
|
local uses = tdef._mcl_diggroups[diggroup].uses
|
||||||
return math.ceil(65535 / uses)
|
return math.ceil(65535 / uses)
|
||||||
end
|
end
|
||||||
|
@ -370,6 +362,12 @@ local function overwrite()
|
||||||
minetest.override_item(tname, {
|
minetest.override_item(tname, {
|
||||||
tool_capabilities = toolcaps
|
tool_capabilities = toolcaps
|
||||||
})
|
})
|
||||||
|
else
|
||||||
|
-- This is needed to deal damage when punching mobs
|
||||||
|
-- with random items in hand in survival mode
|
||||||
|
minetest.override_item(tname, {
|
||||||
|
tool_capabilities = mcl_meshhand.survival_hand_tool_caps
|
||||||
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -96,8 +96,8 @@ function mcl_damage.finish_reason(mcl_reason)
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_damage.from_mt(mt_reason)
|
function mcl_damage.from_mt(mt_reason)
|
||||||
if mt_reason._mcl_cached_reason then
|
if mt_reason._mcl_chached_reason then
|
||||||
return mt_reason._mcl_cached_reason
|
return mt_reason._mcl_chached_reason
|
||||||
end
|
end
|
||||||
|
|
||||||
local mcl_reason
|
local mcl_reason
|
||||||
|
|
|
@ -13,7 +13,6 @@ under the LGPLv2.1 license.
|
||||||
mcl_explosions = {}
|
mcl_explosions = {}
|
||||||
|
|
||||||
local mod_fire = minetest.get_modpath("mcl_fire")
|
local mod_fire = minetest.get_modpath("mcl_fire")
|
||||||
local explosions_griefing = minetest.settings:get_bool("mcl_explosions_griefing", true)
|
|
||||||
--local CONTENT_FIRE = minetest.get_content_id("mcl_fire:fire")
|
--local CONTENT_FIRE = minetest.get_content_id("mcl_fire:fire")
|
||||||
|
|
||||||
local math = math
|
local math = math
|
||||||
|
@ -192,7 +191,7 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
|
||||||
local grief_protected = info.grief_protected
|
local grief_protected = info.grief_protected
|
||||||
|
|
||||||
-- Trace rays for environment destruction
|
-- Trace rays for environment destruction
|
||||||
if info.griefing and explosions_griefing then
|
if info.griefing then
|
||||||
for i = 1, #raydirs do
|
for i = 1, #raydirs do
|
||||||
local rpos_x = pos.x
|
local rpos_x = pos.x
|
||||||
local rpos_y = pos.y
|
local rpos_y = pos.y
|
||||||
|
@ -352,23 +351,6 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Punch End Crystals to make them explode
|
|
||||||
if ent and ent.name == "mcl_end:crystal" then
|
|
||||||
if direct then
|
|
||||||
local puncher = direct:get_luaentity()
|
|
||||||
if puncher and puncher.name == "mcl_end:crystal" then
|
|
||||||
ent.object:punch(direct, 1.0, { -- End Crystal nearby, trigger it.
|
|
||||||
full_punch_interval = 1.0,
|
|
||||||
damage_groups = {fleshy = 1},
|
|
||||||
}, nil, nil)
|
|
||||||
else
|
|
||||||
ent.object:remove() -- Direct Exists, but it is not an end crystal, remove crystal.
|
|
||||||
end
|
|
||||||
else
|
|
||||||
ent.object:remove() -- Node exploded the end crystal, remove it.
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local airs, fires = {}, {}
|
local airs, fires = {}, {}
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
# textdomain:mcl_explosions
|
|
||||||
@1 was caught in an explosion.=@1 est mort dans une explosion
|
|
|
@ -1,2 +0,0 @@
|
||||||
# textdomain:mcl_explosions
|
|
||||||
@1 was caught in an explosion.=@1 попал(а) под взрыв.
|
|
|
@ -1,2 +0,0 @@
|
||||||
# textdomain:mcl_explosions
|
|
||||||
@1 was caught in an explosion.=
|
|
|
@ -1,14 +0,0 @@
|
||||||
# Oxidization API for MineClone 2
|
|
||||||
This mods adds the oxidization api, so that modders can easily use the same features that copper uses.
|
|
||||||
|
|
||||||
## API
|
|
||||||
To take advantage of the actual oxidization, put `oxidizable = 1` into the list of groups for the oxidizable node.
|
|
||||||
You would also need to put `_mcl_oxidized_variant = itemstring of node this node will oxidize into` into the node definition.
|
|
||||||
For example, a copper block oxidizes into exposed copper, so the defintion would be `_mcl_oxidized_variant = "mcl_copper:block_exposed"`.
|
|
||||||
|
|
||||||
To utilize the ability to wax the block for protection from oxidization, put `mcl_waxed_variant = item string of waxed variant of node` into the node definition table.
|
|
||||||
For example, Copper Blocks have the definition arguement of `_mcl_waxed_variant = "mcl_copper:waxed_block"`.
|
|
||||||
|
|
||||||
For waxed nodes, scraping is easy. Start by putting `waxed = 1` into the list of groups of the waxed node.
|
|
||||||
Next put `_mcl_stripped_variant = item string of the unwaxed variant of the node` into the defintion table.
|
|
||||||
Waxed Copper Blocks can be scrapped into normal Copper Blocks because of the definition `_mcl_stripped_variant = "mcl_copper:block"`.
|
|
|
@ -1,12 +0,0 @@
|
||||||
minetest.register_abm({
|
|
||||||
label = "Oxidatize Nodes",
|
|
||||||
nodenames = { "group:oxidizable" },
|
|
||||||
interval = 500,
|
|
||||||
chance = 3,
|
|
||||||
action = function(pos, node)
|
|
||||||
local def = minetest.registered_nodes[node.name]
|
|
||||||
if def and def._mcl_oxidized_variant then
|
|
||||||
minetest.set_node(pos, { name = def._mcl_oxidized_variant, param2 = node.param2 })
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
})
|
|
|
@ -1,4 +0,0 @@
|
||||||
name = mcl_oxidation
|
|
||||||
title = Oxidation API for MineClone 2
|
|
||||||
author = PrairieWind, N011, Michael
|
|
||||||
description = API to allow oxidizing different nodes.
|
|
|
@ -34,76 +34,6 @@ function mcl_util.mcl_log(message, module, bypass_default_logger)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local player_timers = {}
|
|
||||||
|
|
||||||
-- This is a dtime timer than can be used in on_step functions so it works every x seconds
|
|
||||||
-- self - Object you want to store timer data on. E.g. mob or a minecart, or player_name
|
|
||||||
-- dtime - The time since last run of on_step, should be passed in to function
|
|
||||||
-- timer_name - This is the name of the timer and also the key to store the data. No spaces + lowercase.
|
|
||||||
-- threshold - The time before it returns successful. 0.2 if you want to run it 5 times a second.
|
|
||||||
function mcl_util.check_dtime_timer(self, dtime, timer_name, threshold)
|
|
||||||
if not self or not threshold or not dtime then return end
|
|
||||||
if not timer_name or timer_name == "" then return end
|
|
||||||
|
|
||||||
if type(self) == "string" then
|
|
||||||
local player_name = self
|
|
||||||
if not player_timers[player_name] then
|
|
||||||
player_timers[player_name] = {}
|
|
||||||
end
|
|
||||||
self = player_timers[player_name]
|
|
||||||
end
|
|
||||||
|
|
||||||
if not self._timers then
|
|
||||||
self._timers = {}
|
|
||||||
end
|
|
||||||
|
|
||||||
if not self._timers[timer_name] then
|
|
||||||
self._timers[timer_name] = 0
|
|
||||||
else
|
|
||||||
self._timers[timer_name] = self._timers[timer_name] + dtime
|
|
||||||
--minetest.log("dtime: " .. tostring(self._timers[timer_name]))
|
|
||||||
end
|
|
||||||
|
|
||||||
if self._timers[timer_name] > threshold then
|
|
||||||
--minetest.log("Over threshold")
|
|
||||||
self._timers[timer_name] = 0
|
|
||||||
return true
|
|
||||||
--else
|
|
||||||
--minetest.log("Not over threshold")
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
-- While we should always favour the new minetest vector functions such as vector.new or vector.offset which validate on
|
|
||||||
-- creation. There may be cases where state gets corrupted and we may have to check the vector is valid if created the
|
|
||||||
-- old way. This allows us to do this as a tactical solution until old style vectors are completely removed.
|
|
||||||
function mcl_util.validate_vector (vect)
|
|
||||||
if vect then
|
|
||||||
if tonumber(vect.x) and tonumber(vect.y) and tonumber(vect.z) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Minetest 5.3.0 or less can only measure the light level. This came in at 5.4
|
|
||||||
-- This function has been known to fail in multiple places so the error handling is added increase safety and improve
|
|
||||||
-- debugging. See:
|
|
||||||
-- https://git.minetest.land/MineClone2/MineClone2/issues/1392
|
|
||||||
function mcl_util.get_natural_light (pos, time)
|
|
||||||
local status, retVal = pcall(minetest.get_natural_light, pos, time)
|
|
||||||
if status then
|
|
||||||
return retVal
|
|
||||||
else
|
|
||||||
minetest.log("warning", "Failed to get natural light at pos: " .. dump(pos) .. ", time: " .. dump(time))
|
|
||||||
if (pos) then
|
|
||||||
local node = minetest.get_node(pos)
|
|
||||||
minetest.log("warning", "Node at pos: " .. dump(node.name))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return 0
|
|
||||||
end
|
|
||||||
|
|
||||||
function mcl_util.file_exists(name)
|
function mcl_util.file_exists(name)
|
||||||
if type(name) ~= "string" then return end
|
if type(name) ~= "string" then return end
|
||||||
local f = io.open(name)
|
local f = io.open(name)
|
||||||
|
@ -624,11 +554,6 @@ function mcl_util.deal_damage(target, damage, mcl_reason)
|
||||||
end
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
elseif not target:is_player() then return end
|
|
||||||
|
|
||||||
local is_immortal = target:get_armor_groups().immortal or 0
|
|
||||||
if is_immortal>0 then
|
|
||||||
return
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local hp = target:get_hp()
|
local hp = target:get_hp()
|
||||||
|
@ -1086,30 +1011,3 @@ function mcl_util.check_position_protection(position, player)
|
||||||
|
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
local palette_indexes = {grass_palette_index = 0, foliage_palette_index = 0, water_palette_index = 0}
|
|
||||||
function mcl_util.get_palette_indexes_from_pos(pos)
|
|
||||||
local biome_data = minetest.get_biome_data(pos)
|
|
||||||
local biome = biome_data.biome
|
|
||||||
local biome_name = minetest.get_biome_name(biome)
|
|
||||||
local reg_biome = minetest.registered_biomes[biome_name]
|
|
||||||
if reg_biome and reg_biome._mcl_grass_palette_index and reg_biome._mcl_foliage_palette_index and reg_biome._mcl_water_palette_index then
|
|
||||||
local gpi = reg_biome._mcl_grass_palette_index
|
|
||||||
local fpi = reg_biome._mcl_foliage_palette_index
|
|
||||||
local wpi = reg_biome._mcl_water_palette_index
|
|
||||||
local palette_indexes = {grass_palette_index = gpi, foliage_palette_index = fpi, water_palette_index = wpi}
|
|
||||||
return palette_indexes
|
|
||||||
else
|
|
||||||
return palette_indexes
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function mcl_util.get_colorwallmounted_rotation(pos)
|
|
||||||
local colorwallmounted_node = minetest.get_node(pos)
|
|
||||||
for i = 0, 32, 1 do
|
|
||||||
local colorwallmounted_rotation = colorwallmounted_node.param2 - (i * 8)
|
|
||||||
if colorwallmounted_rotation < 6 then
|
|
||||||
return colorwallmounted_rotation
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
|
@ -62,13 +62,8 @@ end
|
||||||
local function set_double_attach(boat)
|
local function set_double_attach(boat)
|
||||||
boat._driver:set_attach(boat.object, "",
|
boat._driver:set_attach(boat.object, "",
|
||||||
{x = 0, y = 0.42, z = 0.8}, {x = 0, y = 0, z = 0})
|
{x = 0, y = 0.42, z = 0.8}, {x = 0, y = 0, z = 0})
|
||||||
if boat._passenger:is_player() then
|
boat._passenger:set_attach(boat.object, "",
|
||||||
boat._passenger:set_attach(boat.object, "",
|
{x = 0, y = 0.42, z = -2.2}, {x = 0, y = 0, z = 0})
|
||||||
{x = 0, y = 0.42, z = -6.2}, {x = 0, y = 0, z = 0})
|
|
||||||
else
|
|
||||||
boat._passenger:set_attach(boat.object, "",
|
|
||||||
{x = 0, y = 0.42, z = -4.5}, {x = 0, y = 270, z = 0})
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
local function set_choat_attach(boat)
|
local function set_choat_attach(boat)
|
||||||
boat._driver:set_attach(boat.object, "",
|
boat._driver:set_attach(boat.object, "",
|
||||||
|
@ -160,7 +155,7 @@ local boat = {
|
||||||
minetest.register_on_respawnplayer(detach_object)
|
minetest.register_on_respawnplayer(detach_object)
|
||||||
|
|
||||||
function boat.on_rightclick(self, clicker)
|
function boat.on_rightclick(self, clicker)
|
||||||
if self._passenger or not clicker or clicker:get_attach() or (self.name == "mcl_boats:chest_boat" and self._driver) then
|
if self._passenger or not clicker or clicker:get_attach() then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
attach_object(self, clicker)
|
attach_object(self, clicker)
|
||||||
|
@ -442,9 +437,9 @@ cboat.selectionbox = {-0.7, -0.15, -0.7, 0.7, 0.75, 0.7}
|
||||||
minetest.register_entity("mcl_boats:chest_boat", cboat)
|
minetest.register_entity("mcl_boats:chest_boat", cboat)
|
||||||
mcl_entity_invs.register_inv("mcl_boats:chest_boat","Boat",27)
|
mcl_entity_invs.register_inv("mcl_boats:chest_boat","Boat",27)
|
||||||
|
|
||||||
local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian", "boat_mangrove", "boat_cherry", "chest_boat", "chest_boat_spruce", "chest_boat_birch", "chest_boat_jungle", "chest_boat_acacia", "chest_boat_dark_oak", "chest_boat_mangrove", "chest_boat_cherry" }
|
local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian", "boat_mangrove", "chest_boat", "chest_boat_spruce", "chest_boat_birch", "chest_boat_jungle", "chest_boat_acacia", "chest_boat_dark_oak", "chest_boat_mangrove" }
|
||||||
local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat"), S("Mangrove Boat"), S("Cherry Boat"), S("Oak Chest Boat"), S("Spruce Chest Boat"), S("Birch Chest Boat"), S("Jungle Chest Boat"), S("Acacia Chest Boat"), S("Dark Oak Chest Boat"), S("Mangrove Chest Boat"), S("Cherry Chest Boat") }
|
local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat"), S("Mangrove Boat"), S("Oak Chest Boat"), S("Spruce Chest Boat"), S("Birch Chest Boat"), S("Jungle Chest Boat"), S("Acacia Chest Boat"), S("Dark Oak Chest Boat"), S("Mangrove Chest Boat") }
|
||||||
local craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian", "mcl_mangrove:mangrove_wood", "mcl_cherry_blossom:cherrywood" }
|
local craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian", "mcl_mangrove:mangrove_wood" }
|
||||||
|
|
||||||
for b=1, #boat_ids do
|
for b=1, #boat_ids do
|
||||||
local itemstring = "mcl_boats:"..boat_ids[b]
|
local itemstring = "mcl_boats:"..boat_ids[b]
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
# textdomain: mcl_boats
|
|
||||||
Acacia Boat=Akaciebåd
|
|
||||||
Birch Boat=Birkebåd
|
|
||||||
Boat=Båd
|
|
||||||
Boats are used to travel on the surface of water.=Både blier brugt til at rejse på vandoverflader.
|
|
||||||
Dark Oak Boat=Mørk egetræsbåd
|
|
||||||
Jungle Boat=Junglebåd
|
|
||||||
Oak Boat=Egetræsbåd
|
|
||||||
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Højre-klik på en vand for at placere båden. Højre-klik på båden for at gå ombord. Brug [Left] og [Right] til at styre. [Forwards] for at øge hastigheden, og [Backwards] for at sænke farten eller sejle bagud. Brug [Sneak] for at forlade båden, slå båden for at lave den om til en genstand.
|
|
||||||
Spruce Boat=Granbåd
|
|
||||||
Water vehicle=Vandfartøj
|
|
||||||
Sneak to dismount=Snig for at stige ud
|
|
||||||
Obsidian Boat=Obsidianbåd
|
|
|
@ -8,6 +8,3 @@ Jungle Boat=Barca de la selva
|
||||||
Oak Boat=Barca de roble
|
Oak Boat=Barca de roble
|
||||||
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=Haga clic derecho en una fuente de agua para colocar el barco. Haga clic derecho en el barco para entrar. Utilice [Izquierda] y [Derecha] para dirigir, [Adelante] para acelerar y [Atrás] para reducir la velocidad o retroceder. Haga clic derecho en el barco nuevamente para dejarlo, golpee el barco para que se caiga como un artículo.
|
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=Haga clic derecho en una fuente de agua para colocar el barco. Haga clic derecho en el barco para entrar. Utilice [Izquierda] y [Derecha] para dirigir, [Adelante] para acelerar y [Atrás] para reducir la velocidad o retroceder. Haga clic derecho en el barco nuevamente para dejarlo, golpee el barco para que se caiga como un artículo.
|
||||||
Spruce Boat=Barca de abeto
|
Spruce Boat=Barca de abeto
|
||||||
Water vehicle=Vehículo acuático
|
|
||||||
Sneak to dismount=Agáchate para bajar
|
|
||||||
Obsidian Boat=Barca de obsidiana
|
|
||||||
|
|
|
@ -1,23 +1,13 @@
|
||||||
# textdomain: mcl_boats
|
# textdomain: mcl_boats
|
||||||
Acacia Boat=Bateau en acacia
|
Acacia Boat=Bateau en Acacia
|
||||||
Birch Boat=Bateau en bouleau
|
Birch Boat=Bateau en Bouleau
|
||||||
Boat=Bateau
|
Boat=Bateau
|
||||||
Boats are used to travel on the surface of water.=Les bateaux sont utilisés pour voyager à la surface de l'eau.
|
Boats are used to travel on the surface of water.=Les bateaux sont utilisés pour voyager à la surface de l'eau.
|
||||||
Dark Oak Boat=Bateau en chêne noir
|
Dark Oak Boat=Bateau en Chêne Noir
|
||||||
Jungle Boat=Bateau en acajou
|
Jungle Boat=Bateau en Acajou
|
||||||
Oak Boat=Bateau en chêne
|
Oak Boat=Bateau en Chêne
|
||||||
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Faites un clic droit sur une source d'eau pour placer le bateau. Faites un clic droit sur le bateau pour y entrer. Utilisez [Gauche] et [Droite] pour diriger, [Avant] pour accélérer et [Arrière] pour ralentir ou reculer. Utilisez [Sneak] pour le quitter, frappez le bateau pour le faire tomber en tant qu'objet.
|
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Faites un clic droit sur une source d'eau pour placer le bateau. Faites un clic droit sur le bateau pour y entrer. Utilisez [Gauche] et [Droite] pour diriger, [Avant] pour accélérer et [Arrière] pour ralentir ou reculer. Utilisez [Sneak] pour le quitter, frappez le bateau pour le faire tomber en tant qu'objet.
|
||||||
Spruce Boat=Bateau en sapin
|
Spruce Boat=Bateau en Sapin
|
||||||
Water vehicle=Véhicule aquatique
|
Water vehicle=Véhicule aquatique
|
||||||
Sneak to dismount=Se baisser pour descendre
|
Sneak to dismount=Se baisser pour descendre
|
||||||
Obsidian Boat=Bateau en obsidienne
|
Obsidian Boat=Bateau en Obsidienne
|
||||||
Mangrove Boat=Bateau en palétuvier
|
|
||||||
Cherry Boat=Bateau en cerisier
|
|
||||||
Oak Chest Boat=Bateau en chêne avec coffre
|
|
||||||
Spruce Chest Boat=Bateau en sapin avec coffre
|
|
||||||
Birch Chest Boat=Bateau en bouleau avec coffre
|
|
||||||
Jungle Chest Boat=Bateau en acajou avec coffre
|
|
||||||
Acacia Chest Boat=Bateau en acacia avec coffre
|
|
||||||
Dark Oak Chest Boat=Bateau en chêne noir avec coffre
|
|
||||||
Mangrove Chest Boat=Bateau en palétuvier avec coffre
|
|
||||||
Cherry Chest Boat=Bateau en cerisier avec coffre
|
|
|
@ -1,23 +1,11 @@
|
||||||
# textdomain: mcl_boats
|
# textdomain: mcl_boats
|
||||||
Acacia Boat=Акациевая лодка
|
Acacia Boat=Лодка из акации
|
||||||
Birch Boat=Берёзовая лодка
|
Birch Boat=Берёзовая лодка
|
||||||
Boat=Лодка
|
Boat=Лодка
|
||||||
Boats are used to travel on the surface of water.=На лодке можно плыть по водной поверхности.
|
Boats are used to travel on the surface of water.=С помощью лодки можно путешествовать по водной поверхности.
|
||||||
Dark Oak Boat=Лодка из тёмного дуба
|
Dark Oak Boat=Лодка из тёмного дуба
|
||||||
Jungle Boat=Лодка из тропического дерева
|
Jungle Boat=Лодка из дерева джунглей
|
||||||
Oak Boat=Дубовая лодка
|
Oak Boat=Дубовая лодка
|
||||||
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Правый клик на воде, чтобы установить лодку. Правый клик по лодке, чтобы сесть в нее. [Влево] и [Вправо] - рулить, [Вперед] - разгоняться, [Назад] - тормозить или плыть назад. Нажмите [Красться] для высадки, бейте по лодке, чтобы забрать её.
|
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=Правый клик по воде спустит лодку на воду. Правый клик по лодке разместит вас в ней. [Влево] и [Вправо] - рулить, [Вперед] - разгоняться, [Назад] - тормозить или плыть назад. Правый клик по лодке, когда вы в ней, позволит выйти из неё. Удар по лодке превратит её обратно в предмет.
|
||||||
Spruce Boat=Еловая лодка
|
Spruce Boat=Еловая лодка
|
||||||
Water vehicle=Водный транспорт
|
Water vehicle=Водный транспорт
|
||||||
Sneak to dismount=Нажмите [Красться] для высадки
|
|
||||||
Obsidian Boat=Обсидиановая лодка
|
|
||||||
Mangrove Boat=Мангровая лодка
|
|
||||||
Cherry Boat=Вишнёвая лодка
|
|
||||||
Oak Chest Boat=Дубовая лодка с сундуком
|
|
||||||
Spruce Chest Boat=Еловая лодка с сундуком
|
|
||||||
Birch Chest Boat=Берёзовая лодка с сундуком
|
|
||||||
Jungle Chest Boat=Лодка из тропического дерева с сундуком
|
|
||||||
Acacia Chest Boat=Акациевая лодка с сундуком
|
|
||||||
Dark Oak Chest Boat=Лодка из тёмного дуба с сундуком
|
|
||||||
Mangrove Chest Boat=Мангровая лодка с сундуком
|
|
||||||
Cherry Chest Boat=Вишнёвая лодка с сундуком
|
|
|
@ -10,14 +10,4 @@ Rightclick on a water source to place the boat. Rightclick the boat to enter it.
|
||||||
Spruce Boat=
|
Spruce Boat=
|
||||||
Water vehicle=
|
Water vehicle=
|
||||||
Sneak to dismount=
|
Sneak to dismount=
|
||||||
Obsidian Boat=
|
Obsidian Boat=
|
||||||
Mangrove Boat=
|
|
||||||
Cherry Boat=
|
|
||||||
Oak Chest Boat=
|
|
||||||
Spruce Chest Boat=
|
|
||||||
Birch Chest Boat=
|
|
||||||
Jungle Chest Boat=
|
|
||||||
Acacia Chest Boat=
|
|
||||||
Dark Oak Chest Boat=
|
|
||||||
Mangrove Chest Boat=
|
|
||||||
Cherry Chest Boat=
|
|
|
@ -5,12 +5,7 @@ function mcl_burning.get_storage(obj)
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_burning.is_burning(obj)
|
function mcl_burning.is_burning(obj)
|
||||||
local storage = mcl_burning.get_storage(obj)
|
return mcl_burning.get_storage(obj).burn_time
|
||||||
if storage then
|
|
||||||
return mcl_burning.get_storage(obj).burn_time
|
|
||||||
else
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_burning.is_affected_by_rain(obj)
|
function mcl_burning.is_affected_by_rain(obj)
|
||||||
|
@ -158,11 +153,6 @@ function mcl_burning.extinguish(obj)
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_burning.tick(obj, dtime, storage)
|
function mcl_burning.tick(obj, dtime, storage)
|
||||||
if not storage then
|
|
||||||
minetest.log("warning", "No storage for burning tick. Should not happen: " .. dump(obj))
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
if storage.burn_time then
|
if storage.burn_time then
|
||||||
storage.burn_time = storage.burn_time - dtime
|
storage.burn_time = storage.burn_time - dtime
|
||||||
|
|
||||||
|
|
|
@ -1,36 +1,36 @@
|
||||||
# mcl_dripping
|
# mcl_dripping
|
||||||
|
|
||||||
Dripping Mod by kddekadenz, modified for MineClone 2 by Wuzzy, NO11 and AFCM
|
Dripping Mod by kddekadenz, modified for MineClone 2 by Wuzzy, NO11 and AFCM
|
||||||
|
|
||||||
## Manual
|
## Manual
|
||||||
|
|
||||||
- drops are generated rarely under solid nodes
|
- drops are generated rarely under solid nodes
|
||||||
- they will stay some time at the generated block and than they fall down
|
- they will stay some time at the generated block and than they fall down
|
||||||
- when they collide with the ground, a sound is played and they are destroyed
|
- when they collide with the ground, a sound is played and they are destroyed
|
||||||
|
|
||||||
Water and Lava have builtin drops registered.
|
Water and Lava have builtin drops registered.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
code & sounds: CC0
|
code & sounds: CC0
|
||||||
|
|
||||||
## API
|
## API
|
||||||
|
|
||||||
```lua
|
```lua
|
||||||
mcl_dripping.register_drop({
|
mcl_dripping.register_drop({
|
||||||
-- The group the liquid's nodes belong to
|
-- The group the liquid's nodes belong to
|
||||||
liquid = "water",
|
liquid = "water",
|
||||||
-- The texture used (particles will take a random 2x2 area of it)
|
-- The texture used (particles will take a random 2x2 area of it)
|
||||||
texture = "mcl_core_water_source_animation.png",
|
texture = "default_water_source_animated.png",
|
||||||
-- Define particle glow, ranges from `0` to `minetest.LIGHT_MAX`
|
-- Define particle glow, ranges from `0` to `minetest.LIGHT_MAX`
|
||||||
light = 1,
|
light = 1,
|
||||||
-- The nodes (or node group) the particles will spawn under
|
-- The nodes (or node group) the particles will spawn under
|
||||||
nodes = { "group:opaque", "group:leaves" },
|
nodes = { "group:opaque", "group:leaves" },
|
||||||
-- The sound that will be played then the particle detaches from the roof, see SimpleSoundSpec in lua_api.txt
|
-- The sound that will be played then the particle detaches from the roof, see SimpleSoundSpec in lua_api.txt
|
||||||
sound = "drippingwater_drip",
|
sound = "drippingwater_drip",
|
||||||
-- The interval for the ABM to run
|
-- The interval for the ABM to run
|
||||||
interval = 60,
|
interval = 60,
|
||||||
-- The chance of the ABM
|
-- The chance of the ABM
|
||||||
chance = 10,
|
chance = 10,
|
||||||
})
|
})
|
||||||
```
|
```
|
||||||
|
|
|
@ -82,7 +82,7 @@ end
|
||||||
|
|
||||||
mcl_dripping.register_drop({
|
mcl_dripping.register_drop({
|
||||||
liquid = "water",
|
liquid = "water",
|
||||||
texture = "mcl_core_water_source_animation.png",
|
texture = "default_water_source_animated.png",
|
||||||
light = 1,
|
light = 1,
|
||||||
nodes = { "group:opaque", "group:leaves" },
|
nodes = { "group:opaque", "group:leaves" },
|
||||||
sound = "drippingwater_drip",
|
sound = "drippingwater_drip",
|
||||||
|
@ -92,7 +92,7 @@ mcl_dripping.register_drop({
|
||||||
|
|
||||||
mcl_dripping.register_drop({
|
mcl_dripping.register_drop({
|
||||||
liquid = "lava",
|
liquid = "lava",
|
||||||
texture = "mcl_core_lava_source_animation.png",
|
texture = "default_lava_source_animated.png",
|
||||||
light = math.max(7, minetest.registered_nodes["mcl_core:lava_source"].light_source - 3),
|
light = math.max(7, minetest.registered_nodes["mcl_core:lava_source"].light_source - 3),
|
||||||
nodes = { "group:opaque" },
|
nodes = { "group:opaque" },
|
||||||
sound = "drippingwater_lavadrip",
|
sound = "drippingwater_lavadrip",
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
# textdomain: mcl_falling_nodes
|
|
||||||
@1 was smashed by a falling anvil.=@1 blev smadret af en nedfaldende ambolt.
|
|
||||||
@1 was smashed by a falling block.=@1 blev smadret af en nedfaldende blok.
|
|
|
@ -1,3 +0,0 @@
|
||||||
# textdomain: mcl_falling_nodes
|
|
||||||
@1 was smashed by a falling anvil.=@1 fue aplastado por un yunque.
|
|
||||||
@1 was smashed by a falling block.=@1 fue aplastado por un bloque.
|
|
|
@ -1,3 +0,0 @@
|
||||||
# textdomain: mcl_falling_nodes
|
|
||||||
@1 was smashed by a falling anvil.=@1 a été écrasé par une enclume
|
|
||||||
@1 was smashed by a falling block.=@1 a été écrasé par un bloc
|
|
|
@ -1,3 +0,0 @@
|
||||||
# textdomain: mcl_falling_nodes
|
|
||||||
@1 was smashed by a falling anvil.=@1 был(а) раздавлен(а) падающей наковальней.
|
|
||||||
@1 was smashed by a falling block.=@1 был(а) раздавлен(а) падающим блоком.
|
|
|
@ -1,3 +0,0 @@
|
||||||
# textdomain: mcl_falling_nodes
|
|
||||||
@1 was smashed by a falling anvil.=
|
|
||||||
@1 was smashed by a falling block.=
|
|
|
@ -7,7 +7,12 @@ local pool = {}
|
||||||
local tick = false
|
local tick = false
|
||||||
|
|
||||||
|
|
||||||
|
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_item_entities", false)
|
||||||
|
local function mcl_log(message)
|
||||||
|
if LOGGING_ON then
|
||||||
|
mcl_util.mcl_log(message, "[Item Entities]", true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
minetest.register_on_joinplayer(function(player)
|
minetest.register_on_joinplayer(function(player)
|
||||||
pool[player:get_player_name()] = 0
|
pool[player:get_player_name()] = 0
|
||||||
|
@ -403,176 +408,114 @@ local function cxcz(o, cw, one, zero)
|
||||||
return o
|
return o
|
||||||
end
|
end
|
||||||
|
|
||||||
local function nodes_destroy_items (self, moveresult, def, nn)
|
local function hopper_take_item(self, pos)
|
||||||
local lg = minetest.get_item_group(nn, "lava")
|
--mcl_log("self.itemstring: ".. self.itemstring)
|
||||||
local fg = minetest.get_item_group(nn, "fire")
|
--mcl_log("self.itemstring: ".. minetest.pos_to_string(pos))
|
||||||
local dg = minetest.get_item_group(nn, "destroys_items")
|
|
||||||
|
|
||||||
if (def and (lg ~= 0 or fg ~= 0 or dg == 1)) then
|
local objs = minetest.get_objects_inside_radius(pos, 2)
|
||||||
local item_string = self.itemstring
|
|
||||||
local item_name = ItemStack(item_string):get_name()
|
|
||||||
|
|
||||||
--Wait 2 seconds to allow mob drops to be cooked, & picked up instead of instantly destroyed.
|
if objs and self.itemstring then
|
||||||
if self.age > 2 and minetest.get_item_group(item_name, "fire_immune") == 0 then
|
--mcl_log("there is an itemstring. Number of objs: ".. #objs)
|
||||||
if dg ~= 2 then
|
|
||||||
minetest.sound_play("builtin_item_lava", { pos = self.object:get_pos(), gain = 0.5 })
|
|
||||||
end
|
|
||||||
self._removed = true
|
|
||||||
self.object:remove()
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Destroy item when it collides with a cactus
|
for k, v in pairs(objs) do
|
||||||
if moveresult and moveresult.collides then
|
local ent = v:get_luaentity()
|
||||||
for _, collision in pairs(moveresult.collisions) do
|
|
||||||
local pos = collision.node_pos
|
-- Don't forget actual hoppers
|
||||||
if collision.type == "node" and minetest.get_node(pos).name == "mcl_core:cactus" then
|
if ent and ent.name == "mcl_minecarts:hopper_minecart" then
|
||||||
-- TODO We need to play a sound when it gets destroyed
|
local taken_items = false
|
||||||
self._removed = true
|
|
||||||
self.object:remove()
|
mcl_log("ent.name: " .. tostring(ent.name))
|
||||||
return true
|
mcl_log("ent pos: " .. tostring(ent.object:get_pos()))
|
||||||
|
|
||||||
|
local inv = mcl_entity_invs.load_inv(ent, 5)
|
||||||
|
|
||||||
|
if not inv then
|
||||||
|
mcl_log("No inv")
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
local current_itemstack = ItemStack(self.itemstring)
|
||||||
|
|
||||||
|
mcl_log("inv. size: " .. ent._inv_size)
|
||||||
|
if inv:room_for_item("main", current_itemstack) then
|
||||||
|
mcl_log("Room")
|
||||||
|
inv:add_item("main", current_itemstack)
|
||||||
|
self.object:get_luaentity().itemstring = ""
|
||||||
|
self.object:remove()
|
||||||
|
taken_items = true
|
||||||
|
else
|
||||||
|
mcl_log("no Room")
|
||||||
|
end
|
||||||
|
|
||||||
|
if not taken_items then
|
||||||
|
local items_remaining = current_itemstack:get_count()
|
||||||
|
|
||||||
|
-- This will take part of a floating item stack if no slot can hold the full amount
|
||||||
|
for i = 1, ent._inv_size, 1 do
|
||||||
|
local stack = inv:get_stack("main", i)
|
||||||
|
|
||||||
|
mcl_log("i: " .. tostring(i))
|
||||||
|
mcl_log("Items remaining: " .. items_remaining)
|
||||||
|
mcl_log("Name: " .. tostring(stack:get_name()))
|
||||||
|
|
||||||
|
if current_itemstack:get_name() == stack:get_name() then
|
||||||
|
mcl_log("We have a match. Name: " .. tostring(stack:get_name()))
|
||||||
|
|
||||||
|
local room_for = stack:get_stack_max() - stack:get_count()
|
||||||
|
mcl_log("Room for: " .. tostring(room_for))
|
||||||
|
|
||||||
|
if room_for == 0 then
|
||||||
|
-- Do nothing
|
||||||
|
mcl_log("No room")
|
||||||
|
elseif room_for < items_remaining then
|
||||||
|
mcl_log("We have more items remaining than space")
|
||||||
|
|
||||||
|
items_remaining = items_remaining - room_for
|
||||||
|
stack:set_count(stack:get_stack_max())
|
||||||
|
inv:set_stack("main", i, stack)
|
||||||
|
taken_items = true
|
||||||
|
else
|
||||||
|
local new_stack_size = stack:get_count() + items_remaining
|
||||||
|
stack:set_count(new_stack_size)
|
||||||
|
mcl_log("We have more than enough space. Now holds: " .. new_stack_size)
|
||||||
|
|
||||||
|
inv:set_stack("main", i, stack)
|
||||||
|
items_remaining = 0
|
||||||
|
|
||||||
|
self.object:get_luaentity().itemstring = ""
|
||||||
|
self.object:remove()
|
||||||
|
|
||||||
|
taken_items = true
|
||||||
|
break
|
||||||
|
end
|
||||||
|
|
||||||
|
mcl_log("Count: " .. tostring(stack:get_count()))
|
||||||
|
mcl_log("stack max: " .. tostring(stack:get_stack_max()))
|
||||||
|
--mcl_log("Is it empty: " .. stack:to_string())
|
||||||
|
end
|
||||||
|
|
||||||
|
if i == ent._inv_size and taken_items then
|
||||||
|
mcl_log("We are on last item and still have items left. Set final stack size: " .. items_remaining)
|
||||||
|
current_itemstack:set_count(items_remaining)
|
||||||
|
--mcl_log("Itemstack2: " .. current_itemstack:to_string())
|
||||||
|
self.itemstring = current_itemstack:to_string()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
--Add in, and delete
|
||||||
|
if taken_items then
|
||||||
|
mcl_log("Saving")
|
||||||
|
mcl_entity_invs.save_inv(ent)
|
||||||
|
return taken_items
|
||||||
|
else
|
||||||
|
mcl_log("No need to save")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
local function push_out_item_stuck_in_solid(self, dtime, p, def, is_in_water)
|
return false
|
||||||
if not is_in_water and def and def.walkable and def.groups and def.groups.opaque == 1 then
|
|
||||||
local shootdir
|
|
||||||
local cx = (p.x % 1) - 0.5
|
|
||||||
local cz = (p.z % 1) - 0.5
|
|
||||||
local order = {}
|
|
||||||
|
|
||||||
-- First prepare the order in which the 4 sides are to be checked.
|
|
||||||
-- 1st: closest
|
|
||||||
-- 2nd: other direction
|
|
||||||
-- 3rd and 4th: other axis
|
|
||||||
if math.abs(cx) < math.abs(cz) then
|
|
||||||
order = cxcz(order, cx, "x", "z")
|
|
||||||
order = cxcz(order, cz, "z", "x")
|
|
||||||
else
|
|
||||||
order = cxcz(order, cz, "z", "x")
|
|
||||||
order = cxcz(order, cx, "x", "z")
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Check which one of the 4 sides is free
|
|
||||||
for o = 1, #order do
|
|
||||||
local nn = minetest.get_node(vector.add(p, order[o])).name
|
|
||||||
local def = minetest.registered_nodes[nn]
|
|
||||||
if def and def.walkable == false and nn ~= "ignore" then
|
|
||||||
shootdir = order[o]
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
-- If none of the 4 sides is free, shoot upwards
|
|
||||||
if shootdir == nil then
|
|
||||||
shootdir = vector.new(0, 1, 0)
|
|
||||||
local nn = minetest.get_node(vector.add(p, shootdir)).name
|
|
||||||
if nn == "ignore" then
|
|
||||||
-- Do not push into ignore
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Set new item moving speed accordingly
|
|
||||||
local newv = vector.multiply(shootdir, 3)
|
|
||||||
self.object:set_acceleration(vector.zero())
|
|
||||||
self.object:set_velocity(newv)
|
|
||||||
disable_physics(self.object, self, false, false)
|
|
||||||
|
|
||||||
|
|
||||||
if shootdir.y == 0 then
|
|
||||||
self._force = newv
|
|
||||||
p.x = math.floor(p.x)
|
|
||||||
p.y = math.floor(p.y)
|
|
||||||
p.z = math.floor(p.z)
|
|
||||||
self._forcestart = p
|
|
||||||
self._forcetimer = 1
|
|
||||||
end
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
-- This code is run after the entity got a push from above “push away” code.
|
|
||||||
-- It is responsible for making sure the entity is entirely outside the solid node
|
|
||||||
-- (with its full collision box), not just its center.
|
|
||||||
if self._forcetimer > 0 then
|
|
||||||
local cbox = self.object:get_properties().collisionbox
|
|
||||||
local ok = false
|
|
||||||
if self._force.x > 0 and (p.x > (self._forcestart.x + 0.5 + (cbox[4] - cbox[1]) / 2)) then ok = true
|
|
||||||
elseif self._force.x < 0 and (p.x < (self._forcestart.x + 0.5 - (cbox[4] - cbox[1]) / 2)) then ok = true
|
|
||||||
elseif self._force.z > 0 and (p.z > (self._forcestart.z + 0.5 + (cbox[6] - cbox[3]) / 2)) then ok = true
|
|
||||||
elseif self._force.z < 0 and (p.z < (self._forcestart.z + 0.5 - (cbox[6] - cbox[3]) / 2)) then ok = true end
|
|
||||||
-- Item was successfully forced out. No more pushing
|
|
||||||
if ok then
|
|
||||||
self._forcetimer = -1
|
|
||||||
self._force = nil
|
|
||||||
enable_physics(self.object, self)
|
|
||||||
else
|
|
||||||
self._forcetimer = self._forcetimer - dtime
|
|
||||||
end
|
|
||||||
return true
|
|
||||||
elseif self._force then
|
|
||||||
self._force = nil
|
|
||||||
enable_physics(self.object, self)
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local function move_items_in_water (self, p, def, node, is_floating, is_in_water)
|
|
||||||
-- Move item around on flowing liquids; add 'source' check to allow items to continue flowing a bit in the source block of flowing water.
|
|
||||||
if def and not is_floating and (def.liquidtype == "flowing" or def.liquidtype == "source") then
|
|
||||||
self._flowing = true
|
|
||||||
|
|
||||||
--[[ Get flowing direction (function call from flowlib), if there's a liquid.
|
|
||||||
NOTE: According to Qwertymine, flowlib.quickflow is only reliable for liquids with a flowing distance of 7.
|
|
||||||
Luckily, this is exactly what we need if we only care about water, which has this flowing distance. ]]
|
|
||||||
local vec = flowlib.quick_flow(p, node)
|
|
||||||
-- Just to make sure we don't manipulate the speed for no reason
|
|
||||||
if vec.x ~= 0 or vec.y ~= 0 or vec.z ~= 0 then
|
|
||||||
-- Minecraft Wiki: Flowing speed is "about 1.39 meters per second"
|
|
||||||
local f = 1.2
|
|
||||||
-- Set new item moving speed into the direciton of the liquid
|
|
||||||
local newv = vector.multiply(vec, f)
|
|
||||||
-- Swap to acceleration instead of a static speed to better mimic MC mechanics.
|
|
||||||
self.object:set_acceleration(vector.new(newv.x, -0.22, newv.z))
|
|
||||||
|
|
||||||
self.physical_state = true
|
|
||||||
self._flowing = true
|
|
||||||
self.object:set_properties({
|
|
||||||
physical = true
|
|
||||||
})
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
if is_in_water and def.liquidtype == "source" then
|
|
||||||
local cur_vec = self.object:get_velocity()
|
|
||||||
-- apply some acceleration in the opposite direction so it doesn't slide forever
|
|
||||||
local vec = {
|
|
||||||
x = 0 - cur_vec.x * 0.9,
|
|
||||||
y = 3 - cur_vec.y * 0.9,
|
|
||||||
z = 0 - cur_vec.z * 0.9
|
|
||||||
}
|
|
||||||
self.object:set_acceleration(vec)
|
|
||||||
-- slow down the item in water
|
|
||||||
local vel = self.object:get_velocity()
|
|
||||||
if vel.y < 0 then
|
|
||||||
vel.y = vel.y * 0.9
|
|
||||||
end
|
|
||||||
self.object:set_velocity(vel)
|
|
||||||
if self.physical_state ~= false or self._flowing ~= true then
|
|
||||||
self.physical_state = true
|
|
||||||
self._flowing = true
|
|
||||||
self.object:set_properties({
|
|
||||||
physical = true
|
|
||||||
})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
elseif self._flowing == true and not is_in_water and not is_floating then
|
|
||||||
-- Disable flowing physics if not on/in flowing liquid
|
|
||||||
self._flowing = false
|
|
||||||
enable_physics(self.object, self, true)
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_entity(":__builtin:item", {
|
minetest.register_entity(":__builtin:item", {
|
||||||
|
@ -621,17 +564,13 @@ minetest.register_entity(":__builtin:item", {
|
||||||
if speed ~= nil then self.random_velocity = speed end
|
if speed ~= nil then self.random_velocity = speed end
|
||||||
|
|
||||||
local vel = self.object:get_velocity()
|
local vel = self.object:get_velocity()
|
||||||
|
|
||||||
-- There is perhaps a cleverer way of making this physical so it bounces off the wall like swords.
|
|
||||||
local max_vel = 6.5 -- Faster than this and it throws it into the wall / floor and turns black because of clipping.
|
|
||||||
|
|
||||||
if vel and vel.x == 0 and vel.z == 0 and self.random_velocity > 0 then
|
if vel and vel.x == 0 and vel.z == 0 and self.random_velocity > 0 then
|
||||||
local v = self.random_velocity
|
local v = self.random_velocity
|
||||||
local x = math.random(5, max_vel) / 10 * v
|
local x = math.random(5, 10) / 10 * v
|
||||||
if math.random(0, 10) < 5 then x = -x end
|
if math.random(0, 10) < 5 then x = -x end
|
||||||
local z = math.random(5, max_vel) / 10 * v
|
local z = math.random(5, 10) / 10 * v
|
||||||
if math.random(0, 10) < 5 then z = -z end
|
if math.random(0, 10) < 5 then z = -z end
|
||||||
local y = math.random(1, 2)
|
local y = math.random(2, 4)
|
||||||
self.object:set_velocity(vector.new(x, y, z))
|
self.object:set_velocity(vector.new(x, y, z))
|
||||||
end
|
end
|
||||||
self.random_velocity = 0
|
self.random_velocity = 0
|
||||||
|
@ -808,19 +747,11 @@ minetest.register_entity(":__builtin:item", {
|
||||||
if total_count > max_count then
|
if total_count > max_count then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Merge the remote stack into this one
|
-- Merge the remote stack into this one
|
||||||
local self_pos = self.object:get_pos()
|
|
||||||
local pos = object:get_pos()
|
|
||||||
|
|
||||||
--local y = pos.y + ((total_count - count) / max_count) * 0.15
|
-- local pos = object:get_pos()
|
||||||
local x_diff = (self_pos.x - pos.x) / 2
|
-- pos.y = pos.y + ((total_count - count) / max_count) * 0.15
|
||||||
local z_diff = (self_pos.z - pos.z) / 2
|
-- self.object:move_to(pos)
|
||||||
|
|
||||||
local new_pos = vector.offset(pos, x_diff, 0, z_diff)
|
|
||||||
new_pos.y = math.max(self_pos.y, pos.y) + 0.1
|
|
||||||
|
|
||||||
self.object:move_to(new_pos)
|
|
||||||
|
|
||||||
self.age = 0 -- Handle as new entity
|
self.age = 0 -- Handle as new entity
|
||||||
own_stack:set_count(total_count)
|
own_stack:set_count(total_count)
|
||||||
|
@ -841,7 +772,6 @@ minetest.register_entity(":__builtin:item", {
|
||||||
self.object:set_acceleration(vector.zero())
|
self.object:set_acceleration(vector.zero())
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
self.age = self.age + dtime
|
self.age = self.age + dtime
|
||||||
if self._collector_timer then
|
if self._collector_timer then
|
||||||
self._collector_timer = self._collector_timer + dtime
|
self._collector_timer = self._collector_timer + dtime
|
||||||
|
@ -855,13 +785,19 @@ minetest.register_entity(":__builtin:item", {
|
||||||
-- otherwise there might have some data corruption.
|
-- otherwise there might have some data corruption.
|
||||||
if self.itemstring == "" then
|
if self.itemstring == "" then
|
||||||
minetest.log("warning",
|
minetest.log("warning",
|
||||||
"Item entity with empty itemstring found and being deleted at: " .. minetest.pos_to_string(self.object:get_pos()))
|
"Item entity with empty itemstring found at " .. minetest.pos_to_string(self.object:get_pos()) ..
|
||||||
|
"! Deleting it now.")
|
||||||
self._removed = true
|
self._removed = true
|
||||||
self.object:remove()
|
self.object:remove()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local p = self.object:get_pos()
|
local p = self.object:get_pos()
|
||||||
|
-- If hopper has taken item, it has gone, and no operations should be conducted on this item
|
||||||
|
if hopper_take_item(self, p) then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local node = minetest.get_node(p)
|
local node = minetest.get_node(p)
|
||||||
local in_unloaded = node.name == "ignore"
|
local in_unloaded = node.name == "ignore"
|
||||||
|
|
||||||
|
@ -871,9 +807,6 @@ minetest.register_entity(":__builtin:item", {
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if self.is_clock then
|
if self.is_clock then
|
||||||
self.object:set_properties({
|
self.object:set_properties({
|
||||||
textures = { "mcl_clock:clock_" .. (mcl_worlds.clock_works(p) and mcl_clock.old_time or mcl_clock.random_frame) }
|
textures = { "mcl_clock:clock_" .. (mcl_worlds.clock_works(p) and mcl_clock.old_time or mcl_clock.random_frame) }
|
||||||
|
@ -909,12 +842,167 @@ minetest.register_entity(":__builtin:item", {
|
||||||
-- Destroy item in lava, fire or special nodes
|
-- Destroy item in lava, fire or special nodes
|
||||||
|
|
||||||
local def = minetest.registered_nodes[nn]
|
local def = minetest.registered_nodes[nn]
|
||||||
|
local lg = minetest.get_item_group(nn, "lava")
|
||||||
|
local fg = minetest.get_item_group(nn, "fire")
|
||||||
|
local dg = minetest.get_item_group(nn, "destroys_items")
|
||||||
|
if (def and (lg ~= 0 or fg ~= 0 or dg == 1)) then
|
||||||
|
--Wait 2 seconds to allow mob drops to be cooked, & picked up instead of instantly destroyed.
|
||||||
|
if self.age > 2 and minetest.get_item_group(self.itemstring, "fire_immune") == 0 then
|
||||||
|
if dg ~= 2 then
|
||||||
|
minetest.sound_play("builtin_item_lava", { pos = self.object:get_pos(), gain = 0.5 })
|
||||||
|
end
|
||||||
|
self._removed = true
|
||||||
|
self.object:remove()
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if nodes_destroy_items(self, moveresult, def, nn) then return end
|
-- Destroy item when it collides with a cactus
|
||||||
|
if moveresult and moveresult.collides then
|
||||||
|
for _, collision in pairs(moveresult.collisions) do
|
||||||
|
local pos = collision.node_pos
|
||||||
|
if collision.type == "node" and minetest.get_node(pos).name == "mcl_core:cactus" then
|
||||||
|
self._removed = true
|
||||||
|
self.object:remove()
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if push_out_item_stuck_in_solid(self, dtime, p, def, is_in_water) then return end
|
-- Push item out when stuck inside solid opaque node
|
||||||
|
if not is_in_water and def and def.walkable and def.groups and def.groups.opaque == 1 then
|
||||||
|
local shootdir
|
||||||
|
local cx = (p.x % 1) - 0.5
|
||||||
|
local cz = (p.z % 1) - 0.5
|
||||||
|
local order = {}
|
||||||
|
|
||||||
if move_items_in_water (self, p, def, node, is_floating, is_in_water) then return end
|
-- First prepare the order in which the 4 sides are to be checked.
|
||||||
|
-- 1st: closest
|
||||||
|
-- 2nd: other direction
|
||||||
|
-- 3rd and 4th: other axis
|
||||||
|
if math.abs(cx) < math.abs(cz) then
|
||||||
|
order = cxcz(order, cx, "x", "z")
|
||||||
|
order = cxcz(order, cz, "z", "x")
|
||||||
|
else
|
||||||
|
order = cxcz(order, cz, "z", "x")
|
||||||
|
order = cxcz(order, cx, "x", "z")
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Check which one of the 4 sides is free
|
||||||
|
for o = 1, #order do
|
||||||
|
local nn = minetest.get_node(vector.add(p, order[o])).name
|
||||||
|
local def = minetest.registered_nodes[nn]
|
||||||
|
if def and def.walkable == false and nn ~= "ignore" then
|
||||||
|
shootdir = order[o]
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
-- If none of the 4 sides is free, shoot upwards
|
||||||
|
if shootdir == nil then
|
||||||
|
shootdir = vector.new(0, 1, 0)
|
||||||
|
local nn = minetest.get_node(vector.add(p, shootdir)).name
|
||||||
|
if nn == "ignore" then
|
||||||
|
-- Do not push into ignore
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Set new item moving speed accordingly
|
||||||
|
local newv = vector.multiply(shootdir, 3)
|
||||||
|
self.object:set_acceleration(vector.zero())
|
||||||
|
self.object:set_velocity(newv)
|
||||||
|
disable_physics(self.object, self, false, false)
|
||||||
|
|
||||||
|
|
||||||
|
if shootdir.y == 0 then
|
||||||
|
self._force = newv
|
||||||
|
p.x = math.floor(p.x)
|
||||||
|
p.y = math.floor(p.y)
|
||||||
|
p.z = math.floor(p.z)
|
||||||
|
self._forcestart = p
|
||||||
|
self._forcetimer = 1
|
||||||
|
end
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
-- This code is run after the entity got a push from above “push away” code.
|
||||||
|
-- It is responsible for making sure the entity is entirely outside the solid node
|
||||||
|
-- (with its full collision box), not just its center.
|
||||||
|
if self._forcetimer > 0 then
|
||||||
|
local cbox = self.object:get_properties().collisionbox
|
||||||
|
local ok = false
|
||||||
|
if self._force.x > 0 and (p.x > (self._forcestart.x + 0.5 + (cbox[4] - cbox[1]) / 2)) then ok = true
|
||||||
|
elseif self._force.x < 0 and (p.x < (self._forcestart.x + 0.5 - (cbox[4] - cbox[1]) / 2)) then ok = true
|
||||||
|
elseif self._force.z > 0 and (p.z > (self._forcestart.z + 0.5 + (cbox[6] - cbox[3]) / 2)) then ok = true
|
||||||
|
elseif self._force.z < 0 and (p.z < (self._forcestart.z + 0.5 - (cbox[6] - cbox[3]) / 2)) then ok = true end
|
||||||
|
-- Item was successfully forced out. No more pushing
|
||||||
|
if ok then
|
||||||
|
self._forcetimer = -1
|
||||||
|
self._force = nil
|
||||||
|
enable_physics(self.object, self)
|
||||||
|
else
|
||||||
|
self._forcetimer = self._forcetimer - dtime
|
||||||
|
end
|
||||||
|
return
|
||||||
|
elseif self._force then
|
||||||
|
self._force = nil
|
||||||
|
enable_physics(self.object, self)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Move item around on flowing liquids; add 'source' check to allow items to continue flowing a bit in the source block of flowing water.
|
||||||
|
if def and not is_floating and (def.liquidtype == "flowing" or def.liquidtype == "source") then
|
||||||
|
self._flowing = true
|
||||||
|
|
||||||
|
--[[ Get flowing direction (function call from flowlib), if there's a liquid.
|
||||||
|
NOTE: According to Qwertymine, flowlib.quickflow is only reliable for liquids with a flowing distance of 7.
|
||||||
|
Luckily, this is exactly what we need if we only care about water, which has this flowing distance. ]]
|
||||||
|
local vec = flowlib.quick_flow(p, node)
|
||||||
|
-- Just to make sure we don't manipulate the speed for no reason
|
||||||
|
if vec.x ~= 0 or vec.y ~= 0 or vec.z ~= 0 then
|
||||||
|
-- Minecraft Wiki: Flowing speed is "about 1.39 meters per second"
|
||||||
|
local f = 1.2
|
||||||
|
-- Set new item moving speed into the direciton of the liquid
|
||||||
|
local newv = vector.multiply(vec, f)
|
||||||
|
-- Swap to acceleration instead of a static speed to better mimic MC mechanics.
|
||||||
|
self.object:set_acceleration(vector.new(newv.x, -0.22, newv.z))
|
||||||
|
|
||||||
|
self.physical_state = true
|
||||||
|
self._flowing = true
|
||||||
|
self.object:set_properties({
|
||||||
|
physical = true
|
||||||
|
})
|
||||||
|
return
|
||||||
|
end
|
||||||
|
if is_in_water and def.liquidtype == "source" then
|
||||||
|
local cur_vec = self.object:get_velocity()
|
||||||
|
-- apply some acceleration in the opposite direction so it doesn't slide forever
|
||||||
|
local vec = {
|
||||||
|
x = 0 - cur_vec.x * 0.9,
|
||||||
|
y = 3 - cur_vec.y * 0.9,
|
||||||
|
z = 0 - cur_vec.z * 0.9
|
||||||
|
}
|
||||||
|
self.object:set_acceleration(vec)
|
||||||
|
-- slow down the item in water
|
||||||
|
local vel = self.object:get_velocity()
|
||||||
|
if vel.y < 0 then
|
||||||
|
vel.y = vel.y * 0.9
|
||||||
|
end
|
||||||
|
self.object:set_velocity(vel)
|
||||||
|
if self.physical_state ~= false or self._flowing ~= true then
|
||||||
|
self.physical_state = true
|
||||||
|
self._flowing = true
|
||||||
|
self.object:set_properties({
|
||||||
|
physical = true
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
elseif self._flowing == true and not is_in_water and not is_floating then
|
||||||
|
-- Disable flowing physics if not on/in flowing liquid
|
||||||
|
self._flowing = false
|
||||||
|
enable_physics(self.object, self, true)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
-- If node is not registered or node is walkably solid and resting on nodebox
|
-- If node is not registered or node is walkably solid and resting on nodebox
|
||||||
local nn = minetest.get_node(vector.offset(p, 0, -0.5, 0)).name
|
local nn = minetest.get_node(vector.offset(p, 0, -0.5, 0)).name
|
||||||
|
@ -923,13 +1011,14 @@ minetest.register_entity(":__builtin:item", {
|
||||||
local is_on_floor = def and (def.walkable
|
local is_on_floor = def and (def.walkable
|
||||||
and not def.groups.slippery and v.y == 0)
|
and not def.groups.slippery and v.y == 0)
|
||||||
|
|
||||||
if not minetest.registered_nodes[nn] or is_floating or is_on_floor then
|
if not minetest.registered_nodes[nn]
|
||||||
|
or is_floating or is_on_floor then
|
||||||
local own_stack = ItemStack(self.object:get_luaentity().itemstring)
|
local own_stack = ItemStack(self.object:get_luaentity().itemstring)
|
||||||
-- Merge with close entities of the same item
|
-- Merge with close entities of the same item
|
||||||
for _, object in pairs(minetest.get_objects_inside_radius(p, 0.8)) do
|
for _, object in pairs(minetest.get_objects_inside_radius(p, 0.8)) do
|
||||||
local obj = object:get_luaentity()
|
local obj = object:get_luaentity()
|
||||||
if obj and obj.name == "__builtin:item" and obj.physical_state == false then
|
if obj and obj.name == "__builtin:item"
|
||||||
|
and obj.physical_state == false then
|
||||||
if self:try_merge_with(own_stack, object, obj) then
|
if self:try_merge_with(own_stack, object, obj) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
|
@ -11,14 +11,6 @@ mcl_minecarts.check_float_time = 15
|
||||||
dofile(mcl_minecarts.modpath.."/functions.lua")
|
dofile(mcl_minecarts.modpath.."/functions.lua")
|
||||||
dofile(mcl_minecarts.modpath.."/rails.lua")
|
dofile(mcl_minecarts.modpath.."/rails.lua")
|
||||||
|
|
||||||
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_minecarts", false)
|
|
||||||
local function mcl_log(message)
|
|
||||||
if LOGGING_ON then
|
|
||||||
mcl_util.mcl_log(message, "[Minecarts]", true)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
local function detach_driver(self)
|
local function detach_driver(self)
|
||||||
if not self._driver then
|
if not self._driver then
|
||||||
return
|
return
|
||||||
|
@ -59,126 +51,6 @@ end
|
||||||
|
|
||||||
local activate_normal_minecart = detach_driver
|
local activate_normal_minecart = detach_driver
|
||||||
|
|
||||||
local function hopper_take_item(self, dtime)
|
|
||||||
local pos = self.object:get_pos()
|
|
||||||
if not pos then return end
|
|
||||||
|
|
||||||
if not self or self.name ~= "mcl_minecarts:hopper_minecart" then return end
|
|
||||||
|
|
||||||
if mcl_util.check_dtime_timer(self, dtime, "hoppermc_take", 0.15) then
|
|
||||||
--minetest.log("The check timer was triggered: " .. dump(pos) .. ", name:" .. self.name)
|
|
||||||
else
|
|
||||||
--minetest.log("The check timer was not triggered")
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
--mcl_log("self.itemstring: ".. self.itemstring)
|
|
||||||
|
|
||||||
local above_pos = vector.offset(pos, 0, 0.9, 0)
|
|
||||||
--mcl_log("self.itemstring: ".. minetest.pos_to_string(above_pos))
|
|
||||||
local objs = minetest.get_objects_inside_radius(above_pos, 1.25)
|
|
||||||
|
|
||||||
if objs then
|
|
||||||
|
|
||||||
mcl_log("there is an itemstring. Number of objs: ".. #objs)
|
|
||||||
|
|
||||||
for k, v in pairs(objs) do
|
|
||||||
local ent = v:get_luaentity()
|
|
||||||
|
|
||||||
if ent and not ent._removed and ent.itemstring and ent.itemstring ~= "" then
|
|
||||||
local taken_items = false
|
|
||||||
|
|
||||||
mcl_log("ent.name: " .. tostring(ent.name))
|
|
||||||
mcl_log("ent pos: " .. tostring(ent.object:get_pos()))
|
|
||||||
|
|
||||||
local inv = mcl_entity_invs.load_inv(self, 5)
|
|
||||||
if not inv then return false end
|
|
||||||
|
|
||||||
local current_itemstack = ItemStack(ent.itemstring)
|
|
||||||
|
|
||||||
mcl_log("inv. size: " .. self._inv_size)
|
|
||||||
if inv:room_for_item("main", current_itemstack) then
|
|
||||||
mcl_log("Room")
|
|
||||||
inv:add_item("main", current_itemstack)
|
|
||||||
ent.object:get_luaentity().itemstring = ""
|
|
||||||
ent.object:remove()
|
|
||||||
taken_items = true
|
|
||||||
else
|
|
||||||
mcl_log("no Room")
|
|
||||||
end
|
|
||||||
|
|
||||||
if not taken_items then
|
|
||||||
local items_remaining = current_itemstack:get_count()
|
|
||||||
|
|
||||||
-- This will take part of a floating item stack if no slot can hold the full amount
|
|
||||||
for i = 1, self._inv_size, 1 do
|
|
||||||
local stack = inv:get_stack("main", i)
|
|
||||||
|
|
||||||
mcl_log("i: " .. tostring(i))
|
|
||||||
mcl_log("Items remaining: " .. items_remaining)
|
|
||||||
mcl_log("Name: " .. tostring(stack:get_name()))
|
|
||||||
|
|
||||||
if current_itemstack:get_name() == stack:get_name() then
|
|
||||||
mcl_log("We have a match. Name: " .. tostring(stack:get_name()))
|
|
||||||
|
|
||||||
local room_for = stack:get_stack_max() - stack:get_count()
|
|
||||||
mcl_log("Room for: " .. tostring(room_for))
|
|
||||||
|
|
||||||
if room_for == 0 then
|
|
||||||
-- Do nothing
|
|
||||||
mcl_log("No room")
|
|
||||||
elseif room_for < items_remaining then
|
|
||||||
mcl_log("We have more items remaining than space")
|
|
||||||
|
|
||||||
items_remaining = items_remaining - room_for
|
|
||||||
stack:set_count(stack:get_stack_max())
|
|
||||||
inv:set_stack("main", i, stack)
|
|
||||||
taken_items = true
|
|
||||||
else
|
|
||||||
local new_stack_size = stack:get_count() + items_remaining
|
|
||||||
stack:set_count(new_stack_size)
|
|
||||||
mcl_log("We have more than enough space. Now holds: " .. new_stack_size)
|
|
||||||
|
|
||||||
inv:set_stack("main", i, stack)
|
|
||||||
items_remaining = 0
|
|
||||||
|
|
||||||
ent.object:get_luaentity().itemstring = ""
|
|
||||||
ent.object:remove()
|
|
||||||
|
|
||||||
taken_items = true
|
|
||||||
break
|
|
||||||
end
|
|
||||||
|
|
||||||
mcl_log("Count: " .. tostring(stack:get_count()))
|
|
||||||
mcl_log("stack max: " .. tostring(stack:get_stack_max()))
|
|
||||||
--mcl_log("Is it empty: " .. stack:to_string())
|
|
||||||
end
|
|
||||||
|
|
||||||
if i == self._inv_size and taken_items then
|
|
||||||
mcl_log("We are on last item and still have items left. Set final stack size: " .. items_remaining)
|
|
||||||
current_itemstack:set_count(items_remaining)
|
|
||||||
--mcl_log("Itemstack2: " .. current_itemstack:to_string())
|
|
||||||
ent.itemstring = current_itemstack:to_string()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
--Add in, and delete
|
|
||||||
if taken_items then
|
|
||||||
mcl_log("Saving")
|
|
||||||
mcl_entity_invs.save_inv(ent)
|
|
||||||
return taken_items
|
|
||||||
else
|
|
||||||
mcl_log("No need to save")
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Table for item-to-entity mapping. Keys: itemstring, Values: Corresponding entity ID
|
-- Table for item-to-entity mapping. Keys: itemstring, Values: Corresponding entity ID
|
||||||
local entity_mapping = {}
|
local entity_mapping = {}
|
||||||
|
|
||||||
|
@ -194,7 +66,6 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
|
||||||
on_rightclick = on_rightclick,
|
on_rightclick = on_rightclick,
|
||||||
|
|
||||||
_driver = nil, -- player who sits in and controls the minecart (only for minecart!)
|
_driver = nil, -- player who sits in and controls the minecart (only for minecart!)
|
||||||
_passenger = nil, -- for mobs
|
|
||||||
_punched = false, -- used to re-send _velocity and position
|
_punched = false, -- used to re-send _velocity and position
|
||||||
_velocity = {x=0, y=0, z=0}, -- only used on punch
|
_velocity = {x=0, y=0, z=0}, -- only used on punch
|
||||||
_start_pos = nil, -- Used to calculate distance for “On A Rail” achievement
|
_start_pos = nil, -- Used to calculate distance for “On A Rail” achievement
|
||||||
|
@ -215,7 +86,6 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
|
||||||
local data = minetest.deserialize(staticdata)
|
local data = minetest.deserialize(staticdata)
|
||||||
if type(data) == "table" then
|
if type(data) == "table" then
|
||||||
self._railtype = data._railtype
|
self._railtype = data._railtype
|
||||||
self._passenger = data._passenger
|
|
||||||
end
|
end
|
||||||
self.object:set_armor_groups({immortal=1})
|
self.object:set_armor_groups({immortal=1})
|
||||||
|
|
||||||
|
@ -307,11 +177,7 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
|
||||||
|
|
||||||
cart.on_activate_by_rail = on_activate_by_rail
|
cart.on_activate_by_rail = on_activate_by_rail
|
||||||
|
|
||||||
local passenger_attach_position = vector.new(0, -1.75, 0)
|
|
||||||
|
|
||||||
function cart:on_step(dtime)
|
function cart:on_step(dtime)
|
||||||
hopper_take_item(self, dtime)
|
|
||||||
|
|
||||||
local ctrl, player = nil, nil
|
local ctrl, player = nil, nil
|
||||||
if self._driver then
|
if self._driver then
|
||||||
player = minetest.get_player_by_name(self._driver)
|
player = minetest.get_player_by_name(self._driver)
|
||||||
|
@ -346,29 +212,6 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Grab mob
|
|
||||||
if math.random(1,20) > 15 and not self._passenger then
|
|
||||||
if self.name == "mcl_minecarts:minecart" then
|
|
||||||
local mobsnear = minetest.get_objects_inside_radius(self.object:get_pos(), 1.3)
|
|
||||||
for n=1, #mobsnear do
|
|
||||||
local mob = mobsnear[n]
|
|
||||||
if mob then
|
|
||||||
local entity = mob:get_luaentity()
|
|
||||||
if entity and entity.is_mob then
|
|
||||||
self._passenger = entity
|
|
||||||
mob:set_attach(self.object, "", passenger_attach_position, vector.zero())
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
elseif self._passenger then
|
|
||||||
local passenger_pos = self._passenger.object:get_pos()
|
|
||||||
if not passenger_pos then
|
|
||||||
self._passenger = nil
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Drop minecart if it isn't on a rail anymore
|
-- Drop minecart if it isn't on a rail anymore
|
||||||
if self._last_float_check >= mcl_minecarts.check_float_time then
|
if self._last_float_check >= mcl_minecarts.check_float_time then
|
||||||
pos = self.object:get_pos()
|
pos = self.object:get_pos()
|
||||||
|
@ -393,8 +236,19 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Do not drop minecart. It goes off the rails too frequently, and anyone using them for farms won't
|
-- Drop items and remove cart entity
|
||||||
-- notice and lose their iron and not bother. Not cool until fixed.
|
local pname = ""
|
||||||
|
if player then
|
||||||
|
pname = player:get_player_name()
|
||||||
|
end
|
||||||
|
if not minetest.is_creative_enabled(pname) then
|
||||||
|
for d=1, #drop do
|
||||||
|
minetest.add_item(self.object:get_pos(), drop[d])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
self.object:remove()
|
||||||
|
return
|
||||||
end
|
end
|
||||||
self._last_float_check = 0
|
self._last_float_check = 0
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
# textdomain: mcl_minecarts
|
|
||||||
Minecart=Minevogn
|
|
||||||
Minecarts can be used for a quick transportion on rails.=Minevogne kan bruges til hurtig transport på spor.
|
|
||||||
Minecarts only ride on rails and always follow the tracks. At a T-junction with no straight way ahead, they turn left. The speed is affected by the rail type.=Minevogne kan kun køre på spor, og følger dem altid. Ved et T-kryds uden en vej ligeud drejer de altid til venstre. Farten påvirkes af sportypen.
|
|
||||||
You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Du kan placere minevogne på spor. Højre-klik for at stige ombord.
|
|
||||||
To obtain the minecart, punch it while holding down the sneak key.=For at at få minevognen i din oppakning.
|
|
||||||
A minecart with TNT is an explosive vehicle that travels on rail.=En minevogn med TNT as et eksplosivt fartøj som kører på spor.
|
|
||||||
Place it on rails. Punch it to move it. The TNT is ignited with a flint and steel or when the minecart is on an powered activator rail.=Placér den på spor. Slå den for at flytte den. TNTet bliver antændt med flint og stål eller når minevognen er på et aktiveringsspor.
|
|
||||||
To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=For at få minevognen med TNT i din oppakning skal du slå den mens du holder snigeknappen nede. Du kan ikke gøre dette hvis TNTen er antændt.
|
|
||||||
A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=En minevogn med ovn er et fartøj som kører på spor. Den kan køre af sig selv med brændstof.
|
|
||||||
Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=Placér den på spor. Hvis du putter kul i den vil ovnen brænde i lang tid, og minevognen vil køre af sig selv. Slå den for at sætte den i bevægelse.
|
|
||||||
To obtain the minecart and furnace, punch them while holding down the sneak key.=For at få minevognen med ovn i din oppakning skal du slå den mens du holder snigeknappen nede.
|
|
||||||
Minecart with Chest=Minevogn med kiste
|
|
||||||
Minecart with Furnace=Minevogn med ovn
|
|
||||||
Minecart with Command Block=Minevogn med kommandoblok
|
|
||||||
Minecart with Hopper=Minevogn med tragt
|
|
||||||
Minecart with TNT=Minevogn med TNT
|
|
||||||
Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=Placér dem på jorden for at bygge din jerbane. Sporene kobler sig automatisk sammen med hinanden og laver sving, T-kryds, kryds og skråninger efter behov.
|
|
||||||
Rail=Spor
|
|
||||||
Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Spor kan bruges til at bygge jernbaner til minevogne. Normale spor sænker minevognene en smule på grund af friktionsmodstand.
|
|
||||||
Powered Rail=Strømspor
|
|
||||||
Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Spor kan bruges til at bygge jernbaner til minevogne. Strømspor kan accelerere eller bremse minevogne.
|
|
||||||
Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Uden redstonekraft vil sporet bremse minevognen. For at accelerere minevognen skal den bruge redstoneskraft.
|
|
||||||
Activator Rail=Aktiveringsspor
|
|
||||||
Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Spor kan bruges til at bygge jernbaner til minevogne. Aktiveringsspor bruges til at aktivere specielle minevogne.
|
|
||||||
To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=For at få dette spor til at aktiere minevogne skal du give det redstonekraft og sende en minevogn over dette sporstykke.
|
|
||||||
Detector Rail=Detektorspor
|
|
||||||
Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms.=Spor kan bruges til at bygge jernbaner til minevogne. Et detektorspor kan opdage en minevogn som kører over det og give kraft til redstonemekanismer.
|
|
||||||
To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=For at opdage en minevogn og give redstonekraft skal den forbindes til redstonestøv eller redstonemekanismer og send en hvilkensomhelst minevogn hen over sporet.
|
|
||||||
Track for minecarts=Spor til minevogne.
|
|
||||||
Speed up when powered, slow down when not powered=Accelerérer når der er strøm, sænk hastigheden når der ikke er strøm.
|
|
||||||
Activates minecarts when powered=Aktieverer minevogne når der er strøm.
|
|
||||||
Emits redstone power when a minecart is detected=Udsender redstonekraft når en minevogn bliver opdaget.
|
|
||||||
Vehicle for fast travel on rails=Fartøj til hurtig kørsel på spor.
|
|
||||||
Can be ignited by tools or powered activator rail=Kan antændes med værktøj eller et aktivatorspor med strøm.
|
|
||||||
Sneak to dismount=Snig for at stige af.
|
|
|
@ -10,15 +10,15 @@ To obtain the minecart and TNT, punch them while holding down the sneak key. You
|
||||||
A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Une wagonnet avec un four est un véhicule qui se déplace sur rails. Il peut se propulser avec du carburant.
|
A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Une wagonnet avec un four est un véhicule qui se déplace sur rails. Il peut se propulser avec du carburant.
|
||||||
Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=Placez-le sur des rails. Si vous lui donnez du charbon, le four commencera à brûler pendant longtemps et le wagonnet pourra se déplacer. Frappez-le pour le faire bouger.
|
Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=Placez-le sur des rails. Si vous lui donnez du charbon, le four commencera à brûler pendant longtemps et le wagonnet pourra se déplacer. Frappez-le pour le faire bouger.
|
||||||
To obtain the minecart and furnace, punch them while holding down the sneak key.=Pour obtenir le wagonnet et le four, frappez-les tout en maintenant la touche furtive enfoncée.
|
To obtain the minecart and furnace, punch them while holding down the sneak key.=Pour obtenir le wagonnet et le four, frappez-les tout en maintenant la touche furtive enfoncée.
|
||||||
Minecart with Chest=Wagonnet avec coffre
|
Minecart with Chest=Wagonnet avec Coffre
|
||||||
Minecart with Furnace=Wagonnet avec four
|
Minecart with Furnace=Wagonnet avec Four
|
||||||
Minecart with Command Block=Wagonnet avec bloc de commande
|
Minecart with Command Block=Wagonnet avec Bloc de Commande
|
||||||
Minecart with Hopper=Wagonnet avec entonnoir
|
Minecart with Hopper=Wagonnet avec Entonoir
|
||||||
Minecart with TNT=Wagonnet avec TNT
|
Minecart with TNT=Wagonnet avec TNT
|
||||||
Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=Placez-les sur le sol pour construire votre chemin de fer, les rails se connecteront automatiquement les uns aux autres et se transformeront en courbes, en jonctions en T, en traversées et en pentes au besoin.
|
Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=Placez-les sur le sol pour construire votre chemin de fer, les rails se connecteront automatiquement les uns aux autres et se transformeront en courbes, en jonctions en T, en traversées et en pentes au besoin.
|
||||||
Rail=Rail
|
Rail=Rail
|
||||||
Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Les rails peuvent être utilisés pour construire des voies de transport pour les wagonnets. Les rails ralentissent légèrement les wagonnets en raison de la friction.
|
Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Les rails peuvent être utilisés pour construire des voies de transport pour les wagonnets. Les rails ralentissent légèrement les wagonnets en raison de la friction.
|
||||||
Powered Rail=Rail alimenté
|
Powered Rail=Rail allimenté
|
||||||
Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Les rails peuvent être utilisés pour construire des voies de transport pour les wagonnets. Les rails motorisés sont capables d'accélérer et de freiner les wagonnets.
|
Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Les rails peuvent être utilisés pour construire des voies de transport pour les wagonnets. Les rails motorisés sont capables d'accélérer et de freiner les wagonnets.
|
||||||
Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Sans énergie de redstone, le rail freinera les wagonnets. Pour que ce rail accélère les minecarts, alimentez-le avec une source d'énergie redstone.
|
Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Sans énergie de redstone, le rail freinera les wagonnets. Pour que ce rail accélère les minecarts, alimentez-le avec une source d'énergie redstone.
|
||||||
Activator Rail=Rail d'activation
|
Activator Rail=Rail d'activation
|
||||||
|
|
|
@ -1,36 +1,36 @@
|
||||||
# textdomain: mcl_minecarts
|
# textdomain: mcl_minecarts
|
||||||
Minecart=Вагонетка
|
Minecart=Вагонетка
|
||||||
Minecarts can be used for a quick transportion on rails.=Вагонетка может быть использована для быстрого перемещения по рельсам.
|
Minecarts can be used for a quick transportion on rails.=Вагонетки нужны, чтобы быстро перемещаться по рельсам.
|
||||||
Minecarts only ride on rails and always follow the tracks. At a T-junction with no straight way ahead, they turn left. The speed is affected by the rail type.=Вагонетки едут только по проложенным рельсам. На Т-образной развилке они поворачивают налево. Скорость зависит от типа рельсов.
|
Minecarts only ride on rails and always follow the tracks. At a T-junction with no straight way ahead, they turn left. The speed is affected by the rail type.=Вагонетки едут строго по проложенному железнодорожному пути. На Т-образной развилке они поворачивают налево. Скорость зависит от типа рельсов.
|
||||||
You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Вы можете поставить вагонетку на рельсы. Правым кликом сядьте в неё. Ударьте по ней, чтобы она поехала.
|
You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Вы ставите вагонетку на рельсы. Правым кликом садитесь в неё. Стукаете, чтобы начать движение.
|
||||||
To obtain the minecart, punch it while holding down the sneak key.=Чтобы забрать вагонетку, ударьте по ней, удерживая клавишу [Красться].
|
To obtain the minecart, punch it while holding down the sneak key.=Чтобы взять вагонетку, стукните её, удерживая клавишу [Красться].
|
||||||
A minecart with TNT is an explosive vehicle that travels on rail.=Вагонетка с ТНТ это взрывающийся железнодорожный транспорт.
|
A minecart with TNT is an explosive vehicle that travels on rail.=Вагон тротила это подрывной железнодорожный транспорт.
|
||||||
Place it on rails. Punch it to move it. The TNT is ignited with a flint and steel or when the minecart is on an powered activator rail.=Поместите вагонетку на рельсы. Ударьте по ней, чтобы она поехала. ТНТ активируется, если его поджечь огнивом или когда вагонетка проедет через подключенные активирующие рельсы.
|
Place it on rails. Punch it to move it. The TNT is ignited with a flint and steel or when the minecart is on an powered activator rail.=Поместите его на рельсы. Стукните, чтобы он поехал. Тротил воспламеняется, если его поджечь огнивом, либо при попадании на подключенный рельсовый активатор.
|
||||||
To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=Чтобы забрать вагонетку с ТНТ, ударьте по ней, удерживая клавишу [Красться]. Если ТНТ подожжён, сделать это нельзя.
|
To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=Чтобы взять вагон тротила, стукните его, удерживая клавишу [Красться]. Если тротил воспламенён, сделать это нельзя.
|
||||||
A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Вагонетка с печью это железнодорожный транспорт. Она может ехать сама за счёт топлива.
|
A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Вагон с печью - это железнодорожный транспорт. Он может двигаться за счёт топлива.
|
||||||
Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=Поставьте вагонетку на рельсы. Если добавить в неё угля, то печь будет гореть продолжительное время и вагонетка сможет поехать сама. Ударьте по ней, чтобы она поехала.
|
Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=Поставьте его на рельсы. Если добавить немного угля, то печь зажжётся на продолжительное время и вагон сможет ехать. Стукните вагон для начала движения.
|
||||||
To obtain the minecart and furnace, punch them while holding down the sneak key.=Чтобы забрать вагонетку с печью, ударьте по ней, удерживая клавишу [Красться].
|
To obtain the minecart and furnace, punch them while holding down the sneak key.=Чтобы взять вагон с печью, стукните его, удерживая клавишу [Красться].
|
||||||
Minecart with Chest=Вагонетка с сундуком
|
Minecart with Chest=Вагон с сундуком
|
||||||
Minecart with Furnace=Вагонетка с печью
|
Minecart with Furnace=Вагон с печью
|
||||||
Minecart with Command Block=Вагонетка с командным блоком
|
Minecart with Command Block=Вагон с командным блоком
|
||||||
Minecart with Hopper=Вагонетка с воронкой
|
Minecart with Hopper=Вагон с бункером
|
||||||
Minecart with TNT=Вагонетка с ТНТ
|
Minecart with TNT=Вагон тротила
|
||||||
Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=Поместите рельсы на землю, чтобы сделать железную дорогу, рельсы автоматически соединятся между собой и будут образовывать повороты, T-образные развилки, перекрёстки и склоны там, где это потребуется.
|
Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=Поместите на землю, чтобы сделать железную дорогу, рельсы автоматически соединятся между собой и будут превращаться в плавный повороты, T-образные развилки, перекрёстки и уклоны там, где это потребуется.
|
||||||
Rail=Рельсы
|
Rail=Рельсы
|
||||||
Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Рельсы используются для строительства железной дороги. Обычные рельсы немного замедляют движение вагонеток из-за трения.
|
Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Рельсы используются для строительства железной дороги. Обычные рельсы немного замедляют движение вагонеток из-за трения.
|
||||||
Powered Rail=Энергорельсы
|
Powered Rail=Подключаемые рельсы
|
||||||
Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Энергорельсы используются для строительства железной дороги. Энергорельсы могут ускорять и тормозить вагонетки.
|
Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Рельсы используются для строительства железной дороги. Подключённые рельсы могут разгонять и тормозить вагонетки.
|
||||||
Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Неподключенные энергорельсы замедляют вагонетки. Чтобы энергорельсы ускоряли вагонетки, проведите к ним сигнал редстоуна.
|
Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Без энергии редстоуна рельсы будут тормозить вагонетки.
|
||||||
Activator Rail=Активирующие рельсы
|
Activator Rail=Рельсовый активатор
|
||||||
Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Активирующие рельсы используются для строительства железной дороги. Активирующие рельсы активируют некоторые особые вагонетки.
|
Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Рельсы используются для строительства железной дороги. Рельсовый активатор активирует особые вагонетки.
|
||||||
To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=Чтобы эти рельсы активировали вагонетки, подключите активирующие рельсы к сигналу редстоуна и направьте вагонетку через них.
|
To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=Чтобы этот блок рельсов активировал вагонетку, подключите его к энергии редстоуна и направьте вагонетку через него.
|
||||||
Detector Rail=Нажимные рельсы
|
Detector Rail=Рельсовый детектор
|
||||||
Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms.=Нажимные рельсы используются для строительства железной дороги. Нажимные рельсы реагируют на проезжающие по ним вагонетки и выдают сигнал для механизмов из редстоуна.
|
Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms.=Рельсы используются для строительства железной дороги. Рельсовый детектор может обнаруживать вагонетку у себя наверху и подключать механизмы редстоуна.
|
||||||
To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=Подсоедините к нажимным рельсам редстоун или редстоуновые механизмы, чтобы активировать их когда по рельсам проезжает вагонетка.
|
To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=Чтобы обнаруживать вагонетку и подавать энергию редстоуна, подключите его к дорожке редстоуна или механизму редстоуна, после чего направьте любую вагонетку через него.
|
||||||
Track for minecarts=Железная дорога
|
Track for minecarts=Железная дорога
|
||||||
Speed up when powered, slow down when not powered=Если подключены - ускоряют, если нет - тормозят
|
Speed up when powered, slow down when not powered=Разгоняет, если подключён, тормозит, если не подключён
|
||||||
Activates minecarts when powered=Активирует особые вагонетки, если подключены
|
Activates minecarts when powered=Активирует особые вагонетки, если подключён
|
||||||
Emits redstone power when a minecart is detected=Подает сигнал редстоуна при обнаружении вагонетки
|
Emits redstone power when a minecart is detected=Испускает энергию редстоуна при обнаружении вагонетки
|
||||||
Vehicle for fast travel on rails=Железнодорожный транспорт
|
Vehicle for fast travel on rails=Быстрый железнодорожный транспорт
|
||||||
Can be ignited by tools or powered activator rail=Можно поджечь инструментом или активирующими рельсами
|
Can be ignited by tools or powered activator rail=Можно воспламенить с помощью инструмента или подключенного рельсового активатора
|
||||||
Sneak to dismount=Нажмите [Красться] для высадки
|
Sneak to dismount=Нажмите [Красться] для высадки
|
||||||
|
|
|
@ -2,7 +2,7 @@ local S = minetest.get_translator(minetest.get_current_modname())
|
||||||
|
|
||||||
-- Template rail function
|
-- Template rail function
|
||||||
local function register_rail(itemstring, tiles, def_extras, creative)
|
local function register_rail(itemstring, tiles, def_extras, creative)
|
||||||
local groups = {handy=1,pickaxey=1, attached_node=1,rail=1,connect_to_raillike=minetest.raillike_group("rail"),dig_by_water=0,destroy_by_lava_flow=0, transport=1}
|
local groups = {handy=1,pickaxey=1, attached_node=1,rail=1,connect_to_raillike=minetest.raillike_group("rail"),dig_by_water=1,destroy_by_lava_flow=1, transport=1}
|
||||||
if creative == false then
|
if creative == false then
|
||||||
groups.not_in_creative_inventory = 1
|
groups.not_in_creative_inventory = 1
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,19 +4,23 @@ local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
||||||
-- API for Mobs Redo: MineClone 2 Edition (MRM)
|
-- API for Mobs Redo: MineClone 2 Edition (MRM)
|
||||||
|
|
||||||
local PATHFINDING = "gowp"
|
local PATHFINDING = "gowp"
|
||||||
local CRASH_WARN_FREQUENCY = 60
|
|
||||||
local LIFETIMER_DISTANCE = 47
|
|
||||||
|
|
||||||
-- Localize
|
-- Localize
|
||||||
local S = minetest.get_translator("mcl_mobs")
|
local S = minetest.get_translator("mcl_mobs")
|
||||||
|
|
||||||
local DEVELOPMENT = minetest.settings:get_bool("mcl_development",false)
|
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_mobs_villager",false)
|
||||||
|
local function mcl_log (message)
|
||||||
|
if LOGGING_ON then
|
||||||
|
mcl_util.mcl_log (message, "[Mobs]", true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- Invisibility mod check
|
-- Invisibility mod check
|
||||||
mcl_mobs.invis = {}
|
mcl_mobs.invis = {}
|
||||||
|
|
||||||
local remove_far = true
|
local remove_far = true
|
||||||
|
local mobs_griefing = minetest.settings:get_bool("mobs_griefing") ~= false
|
||||||
|
local spawn_protected = minetest.settings:get_bool("mobs_spawn_protected") ~= false
|
||||||
local mobs_debug = minetest.settings:get_bool("mobs_debug", false) -- Shows helpful debug info above each mob
|
local mobs_debug = minetest.settings:get_bool("mobs_debug", false) -- Shows helpful debug info above each mob
|
||||||
local spawn_logging = minetest.settings:get_bool("mcl_logging_mobs_spawn",true)
|
local spawn_logging = minetest.settings:get_bool("mcl_logging_mobs_spawn",true)
|
||||||
|
|
||||||
|
@ -33,6 +37,15 @@ if minetest.settings:get_bool("only_peaceful_mobs", false) then
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local node_ok = function(pos, fallback)
|
||||||
|
fallback = fallback or mcl_mobs.fallback_node
|
||||||
|
local node = minetest.get_node_or_nil(pos)
|
||||||
|
if node and minetest.registered_nodes[node.name] then
|
||||||
|
return node
|
||||||
|
end
|
||||||
|
return minetest.registered_nodes[fallback]
|
||||||
|
end
|
||||||
|
|
||||||
function mob_class:update_tag() --update nametag and/or the debug box
|
function mob_class:update_tag() --update nametag and/or the debug box
|
||||||
local tag
|
local tag
|
||||||
if mobs_debug then
|
if mobs_debug then
|
||||||
|
@ -61,27 +74,16 @@ function mob_class:update_tag() --update nametag and/or the debug box
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
function mob_class:jock_to(mob, reletive_pos, rot)
|
|
||||||
local pos = self.object:get_pos()
|
|
||||||
if not pos then return end
|
|
||||||
|
|
||||||
self.jockey = mob
|
|
||||||
local jock = minetest.add_entity(pos, mob)
|
|
||||||
if not jock then return end
|
|
||||||
jock:get_luaentity().docile_by_day = false
|
|
||||||
jock:get_luaentity().riden_by_jock = true
|
|
||||||
self.object:set_attach(jock, "", reletive_pos, rot)
|
|
||||||
end
|
|
||||||
|
|
||||||
function mob_class:get_staticdata()
|
function mob_class:get_staticdata()
|
||||||
|
|
||||||
for _,p in pairs(minetest.get_connected_players()) do
|
for _,p in pairs(minetest.get_connected_players()) do
|
||||||
self:remove_particlespawners(p:get_player_name())
|
self:remove_particlespawners(p:get_player_name())
|
||||||
end
|
end
|
||||||
|
|
||||||
-- remove mob when out of range unless tamed
|
-- remove mob when out of range unless tamed
|
||||||
if remove_far
|
if remove_far
|
||||||
and self:despawn_allowed()
|
and self.can_despawn
|
||||||
|
and self.remove_ok
|
||||||
|
and ((not self.nametag) or (self.nametag == ""))
|
||||||
and self.lifetimer <= 20 then
|
and self.lifetimer <= 20 then
|
||||||
if spawn_logging then
|
if spawn_logging then
|
||||||
minetest.log("action", "[mcl_mobs] Mob "..tostring(self.name).." despawns at "..minetest.pos_to_string(vector.round(self.object:get_pos())) .. " - out of range")
|
minetest.log("action", "[mcl_mobs] Mob "..tostring(self.name).." despawns at "..minetest.pos_to_string(vector.round(self.object:get_pos())) .. " - out of range")
|
||||||
|
@ -90,6 +92,7 @@ function mob_class:get_staticdata()
|
||||||
return "remove"-- nil
|
return "remove"-- nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
self.remove_ok = true
|
||||||
self.attack = nil
|
self.attack = nil
|
||||||
self.following = nil
|
self.following = nil
|
||||||
self.state = "stand"
|
self.state = "stand"
|
||||||
|
@ -111,21 +114,6 @@ function mob_class:get_staticdata()
|
||||||
return minetest.serialize(tmp)
|
return minetest.serialize(tmp)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function valid_texture(self, def_textures)
|
|
||||||
if not self.base_texture then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
if self.texture_selected then
|
|
||||||
if #def_textures < self.texture_selected then
|
|
||||||
self.texture_selected = nil
|
|
||||||
else
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
function mob_class:mob_activate(staticdata, def, dtime)
|
function mob_class:mob_activate(staticdata, def, dtime)
|
||||||
if not self.object:get_pos() or staticdata == "remove" then
|
if not self.object:get_pos() or staticdata == "remove" then
|
||||||
mcl_burning.extinguish(self.object)
|
mcl_burning.extinguish(self.object)
|
||||||
|
@ -147,21 +135,17 @@ function mob_class:mob_activate(staticdata, def, dtime)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--If textures in definition change, reload textures
|
if not self.base_texture then
|
||||||
if not valid_texture(self, def.textures) then
|
|
||||||
|
|
||||||
-- compatiblity with old simple mobs textures
|
-- compatiblity with old simple mobs textures
|
||||||
if type(def.textures[1]) == "string" then
|
if type(def.textures[1]) == "string" then
|
||||||
def.textures = {def.textures}
|
def.textures = {def.textures}
|
||||||
end
|
end
|
||||||
|
|
||||||
if not self.texture_selected then
|
local c = 1
|
||||||
local c = 1
|
if #def.textures > c then c = #def.textures end
|
||||||
if #def.textures > c then c = #def.textures end
|
|
||||||
self.texture_selected = math.random(c)
|
|
||||||
end
|
|
||||||
|
|
||||||
self.base_texture = def.textures[self.texture_selected]
|
self.base_texture = def.textures[math.random(c)]
|
||||||
self.base_mesh = def.mesh
|
self.base_mesh = def.mesh
|
||||||
self.base_size = self.visual_size
|
self.base_size = self.visual_size
|
||||||
self.base_colbox = self.collisionbox
|
self.base_colbox = self.collisionbox
|
||||||
|
@ -283,13 +267,6 @@ function mob_class:mob_activate(staticdata, def, dtime)
|
||||||
self._current_animation = nil
|
self._current_animation = nil
|
||||||
self:set_animation( "stand")
|
self:set_animation( "stand")
|
||||||
|
|
||||||
|
|
||||||
if self.riden_by_jock then --- Keep this function before self.on_spawn() is run.
|
|
||||||
self.object:remove()
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
if self.on_spawn and not self.on_spawn_run then
|
if self.on_spawn and not self.on_spawn_run then
|
||||||
if self.on_spawn(self) then
|
if self.on_spawn(self) then
|
||||||
self.on_spawn_run = true
|
self.on_spawn_run = true
|
||||||
|
@ -306,9 +283,6 @@ function mob_class:mob_activate(staticdata, def, dtime)
|
||||||
self._run_armor_init = true
|
self._run_armor_init = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if def.after_activate then
|
if def.after_activate then
|
||||||
def.after_activate(self, staticdata, def, dtime)
|
def.after_activate(self, staticdata, def, dtime)
|
||||||
end
|
end
|
||||||
|
@ -316,33 +290,46 @@ end
|
||||||
|
|
||||||
-- execute current state (stand, walk, run, attacks)
|
-- execute current state (stand, walk, run, attacks)
|
||||||
-- returns true if mob has died
|
-- returns true if mob has died
|
||||||
function mob_class:do_states(dtime, player_in_active_range)
|
function mob_class:do_states(dtime)
|
||||||
--if self.can_open_doors then check_doors(self) end
|
--if self.can_open_doors then check_doors(self) end
|
||||||
|
|
||||||
-- knockback timer. set in on_punch
|
if self.state == "stand" then
|
||||||
if self.pause_timer > 0 then
|
self:do_states_stand()
|
||||||
self.pause_timer = self.pause_timer - dtime
|
elseif self.state == PATHFINDING then
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
self:env_danger_movement_checks(player_in_active_range)
|
|
||||||
|
|
||||||
if self.state == PATHFINDING then
|
|
||||||
self:check_gowp(dtime)
|
self:check_gowp(dtime)
|
||||||
|
elseif self.state == "walk" then
|
||||||
|
self:do_states_walk()
|
||||||
|
elseif self.state == "runaway" then
|
||||||
|
-- runaway when punched
|
||||||
|
self:do_states_runaway()
|
||||||
elseif self.state == "attack" then
|
elseif self.state == "attack" then
|
||||||
|
-- attack routines (explode, dogfight, shoot, dogshoot)
|
||||||
if self:do_states_attack(dtime) then
|
if self:do_states_attack(dtime) then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
else
|
end
|
||||||
if mcl_util.check_dtime_timer(self, dtime, "onstep_dostates", 1) then
|
end
|
||||||
if self.state == "stand" then
|
|
||||||
self:do_states_stand(player_in_active_range)
|
local function update_timers (self, dtime)
|
||||||
elseif self.state == "walk" then
|
-- knockback timer. set in on_punch
|
||||||
self:do_states_walk()
|
if self.pause_timer > 0 then
|
||||||
elseif self.state == "runaway" then
|
self.pause_timer = self.pause_timer - dtime
|
||||||
self:do_states_runaway()
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- attack timer
|
||||||
|
self.timer = self.timer + dtime
|
||||||
|
|
||||||
|
if self.state ~= "attack" and self.state ~= PATHFINDING then
|
||||||
|
if self.timer < 1 then
|
||||||
|
return true
|
||||||
end
|
end
|
||||||
|
self.timer = 0
|
||||||
|
end
|
||||||
|
|
||||||
|
-- never go over 100
|
||||||
|
if self.timer > 100 then
|
||||||
|
self.timer = 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -370,153 +357,89 @@ function mob_class:outside_limits()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- main mob function
|
||||||
|
function mob_class:on_step(dtime)
|
||||||
local function on_step_work (self, dtime)
|
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
if not pos then return end
|
if not pos then return end
|
||||||
|
|
||||||
if self:check_despawn(pos, dtime) then return true end
|
if self:check_despawn(pos, dtime) then return true end
|
||||||
if self:outside_limits() then return end
|
if self:outside_limits() then return end
|
||||||
|
|
||||||
-- Start: Death/damage processing
|
|
||||||
-- All damage needs to be undertaken at the start. We need to exit processing if the mob dies.
|
|
||||||
if self:check_death_and_slow_mob() then
|
if self:check_death_and_slow_mob() then
|
||||||
--minetest.log("action", "Mob is dying: ".. tostring(self.name))
|
--minetest.log("action", "Mob is dying: ".. tostring(self.name))
|
||||||
-- Do we abandon out of here now?
|
-- Do we abandon out of here now?
|
||||||
end
|
end
|
||||||
|
|
||||||
if self:falling(pos) then return end
|
if self:falling(pos) then return end
|
||||||
if self:step_damage (dtime, pos) then return end
|
self:check_suspend()
|
||||||
|
|
||||||
|
if not self.fire_resistant then
|
||||||
|
mcl_burning.tick(self.object, dtime, self)
|
||||||
|
-- mcl_burning.tick may remove object immediately
|
||||||
|
if not self.object:get_pos() then return end
|
||||||
|
end
|
||||||
|
|
||||||
if self.state == "die" then return end
|
if self.state == "die" then return end
|
||||||
-- End: Death/damage processing
|
|
||||||
|
|
||||||
local player_in_active_range = self:player_in_active_range()
|
|
||||||
self:check_suspend(player_in_active_range)
|
|
||||||
|
|
||||||
self:check_water_flow()
|
self:check_water_flow()
|
||||||
|
self:env_danger_movement_checks (dtime)
|
||||||
if not self._jumping_cliff then
|
|
||||||
self._can_jump_cliff = self:can_jump_cliff()
|
|
||||||
else
|
|
||||||
self._can_jump_cliff = false
|
|
||||||
end
|
|
||||||
|
|
||||||
self:flop()
|
|
||||||
|
|
||||||
self:check_smooth_rotation(dtime)
|
|
||||||
|
|
||||||
if player_in_active_range then
|
|
||||||
self:set_animation_speed() -- set animation speed relative to velocity
|
|
||||||
|
|
||||||
self:check_head_swivel(dtime)
|
|
||||||
|
|
||||||
if mcl_util.check_dtime_timer(self, dtime, "onstep_engage", 0.2) then
|
|
||||||
self:check_follow()
|
|
||||||
self:check_runaway_from()
|
|
||||||
self:monster_attack()
|
|
||||||
self:npc_attack()
|
|
||||||
end
|
|
||||||
|
|
||||||
self:check_herd(dtime)
|
|
||||||
|
|
||||||
if self.jump_sound_cooloff > 0 then self.jump_sound_cooloff = self.jump_sound_cooloff - dtime end
|
|
||||||
self:do_jump()
|
|
||||||
end
|
|
||||||
|
|
||||||
if mcl_util.check_dtime_timer(self, dtime, "onstep_occassional", 1) then
|
|
||||||
|
|
||||||
if player_in_active_range then
|
|
||||||
self:check_item_pickup()
|
|
||||||
self:set_armor_texture()
|
|
||||||
self:step_opinion_sound(dtime)
|
|
||||||
end
|
|
||||||
|
|
||||||
self:check_breeding()
|
|
||||||
end
|
|
||||||
|
|
||||||
self:check_aggro(dtime)
|
|
||||||
|
|
||||||
self:check_particlespawners(dtime)
|
|
||||||
|
|
||||||
if self.do_custom and self.do_custom(self, dtime) == false then return end
|
|
||||||
|
|
||||||
if self:do_states(dtime, player_in_active_range) then return end
|
|
||||||
|
|
||||||
if mobs_debug then self:update_tag() end
|
if mobs_debug then self:update_tag() end
|
||||||
|
|
||||||
|
self:follow_flop() -- Mob following code.
|
||||||
|
|
||||||
|
self:set_animation_speed() -- set animation speed relitive to velocity
|
||||||
|
self:check_smooth_rotation(dtime)
|
||||||
|
self:check_head_swivel(dtime)
|
||||||
|
|
||||||
|
if self.jump_sound_cooloff > 0 then
|
||||||
|
self.jump_sound_cooloff = self.jump_sound_cooloff - dtime
|
||||||
|
end
|
||||||
|
self:do_jump()
|
||||||
|
|
||||||
|
self:set_armor_texture()
|
||||||
|
self:check_runaway_from()
|
||||||
|
|
||||||
|
self:monster_attack()
|
||||||
|
self:npc_attack()
|
||||||
|
self:check_breeding()
|
||||||
|
self:check_aggro(dtime)
|
||||||
|
|
||||||
|
-- run custom function (defined in mob lua file)
|
||||||
|
if self.do_custom then
|
||||||
|
if self.do_custom(self, dtime) == false then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if update_timers(self, dtime) then return end
|
||||||
|
|
||||||
|
self:check_particlespawners(dtime)
|
||||||
|
self:check_item_pickup()
|
||||||
|
|
||||||
|
if self.opinion_sound_cooloff > 0 then
|
||||||
|
self.opinion_sound_cooloff = self.opinion_sound_cooloff - dtime
|
||||||
|
end
|
||||||
|
-- mob plays random sound at times. Should be 120. Zombie and mob farms are ridiculous
|
||||||
|
if math.random(1, 70) == 1 then
|
||||||
|
self:mob_sound("random", true)
|
||||||
|
end
|
||||||
|
|
||||||
|
if self:env_damage (dtime, pos) then return end
|
||||||
|
if self:do_states(dtime) then return end
|
||||||
|
|
||||||
if not self.object:get_luaentity() then
|
if not self.object:get_luaentity() then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local last_crash_warn_time = 0
|
|
||||||
|
|
||||||
local function log_error (stack_trace, info, info2)
|
|
||||||
minetest.log("action", "--- Bug report start (please provide a few lines before this also for context) ---")
|
|
||||||
minetest.log("action", "Error: " .. stack_trace)
|
|
||||||
minetest.log("action", "Bug info: " .. info)
|
|
||||||
if info2 then
|
|
||||||
minetest.log("action", "Bug info additional: " .. info2)
|
|
||||||
end
|
|
||||||
minetest.log("action", "--- Bug report end ---")
|
|
||||||
end
|
|
||||||
|
|
||||||
local function warn_user_error ()
|
|
||||||
local current_time = os.time()
|
|
||||||
local time_since_warning = current_time - last_crash_warn_time
|
|
||||||
|
|
||||||
--minetest.log("previous_crash_time: " .. current_time)
|
|
||||||
--minetest.log("last_crash_time: " .. last_crash_warn_time)
|
|
||||||
--minetest.log("time_since_warning: " .. time_since_warning)
|
|
||||||
|
|
||||||
if time_since_warning > CRASH_WARN_FREQUENCY then
|
|
||||||
last_crash_warn_time = current_time
|
|
||||||
minetest.log("A game crashing bug was prevented. Please provide debug.log information to MineClone2 dev team for investigation. (Search for: --- Bug report start)")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local on_step_error_handler = function ()
|
|
||||||
warn_user_error ()
|
|
||||||
local info = debug.getinfo(1, "SnlufL")
|
|
||||||
log_error(tostring(debug.traceback()), dump(info))
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- main mob function
|
|
||||||
function mob_class:on_step(dtime)
|
|
||||||
if not DEVELOPMENT then
|
|
||||||
-- Removed as bundled Lua (5.1 doesn't support xpcall)
|
|
||||||
--local status, retVal = xpcall(on_step_work, on_step_error_handler, self, dtime)
|
|
||||||
local status, retVal = pcall(on_step_work, self, dtime)
|
|
||||||
if status then
|
|
||||||
return retVal
|
|
||||||
else
|
|
||||||
warn_user_error ()
|
|
||||||
local pos = self.object:get_pos()
|
|
||||||
if pos then
|
|
||||||
local node = minetest.get_node(pos)
|
|
||||||
if node and node.name == "ignore" then
|
|
||||||
minetest.log("warning", "Pos is ignored: " .. dump(pos))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
log_error (dump(retVal), dump(pos), dump(self))
|
|
||||||
end
|
|
||||||
else
|
|
||||||
return on_step_work (self, dtime)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local timer = 0
|
local timer = 0
|
||||||
|
minetest.register_globalstep(function(dtime)
|
||||||
local function update_lifetimer(dtime)
|
|
||||||
timer = timer + dtime
|
timer = timer + dtime
|
||||||
if timer < 1 then return end
|
if timer < 1 then return end
|
||||||
for _, player in pairs(minetest.get_connected_players()) do
|
for _, player in pairs(minetest.get_connected_players()) do
|
||||||
local pos = player:get_pos()
|
local pos = player:get_pos()
|
||||||
for _, obj in pairs(minetest.get_objects_inside_radius(pos, LIFETIMER_DISTANCE)) do
|
for _, obj in pairs(minetest.get_objects_inside_radius(pos, 47)) do
|
||||||
local lua = obj:get_luaentity()
|
local lua = obj:get_luaentity()
|
||||||
if lua and lua.is_mob then
|
if lua and lua.is_mob then
|
||||||
lua.lifetimer = math.max(20, lua.lifetimer)
|
lua.lifetimer = math.max(20, lua.lifetimer)
|
||||||
|
@ -525,125 +448,22 @@ local function update_lifetimer(dtime)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
timer = 0
|
timer = 0
|
||||||
end
|
|
||||||
|
|
||||||
minetest.register_globalstep(function(dtime)
|
|
||||||
update_lifetimer(dtime)
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
minetest.register_chatcommand("clearmobs",{
|
||||||
minetest.register_chatcommand("clearmobs", {
|
privs={maphack=true},
|
||||||
privs = { maphack = true },
|
params = "<all>|<nametagged>|<range>",
|
||||||
params = "[all|monster|passive|<mob name> [<range>|nametagged|tamed]]",
|
description=S("Removes all spawned mobs except nametagged and tamed ones. all removes all mobs, nametagged only nametagged ones and with the range paramter all mobs in a distance of the current player are removed."),
|
||||||
description = S("Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to select only nametagged/tamed mobs, or a range to specify a maximum distance from the player."),
|
func=function(n,param)
|
||||||
func = function(player, param)
|
local p = minetest.get_player_by_name(n)
|
||||||
local default = false
|
local num=tonumber(param)
|
||||||
if not param or param == "" then
|
|
||||||
default = true
|
|
||||||
minetest.chat_send_player(player,
|
|
||||||
S("Default usage. Clearing hostile mobs. For more options please type: /help clearmobs"))
|
|
||||||
end
|
|
||||||
local mob, unsafe = param:match("^([%w]+)[ ]?([%w%d]*)$")
|
|
||||||
|
|
||||||
local all = false
|
|
||||||
local nametagged = false
|
|
||||||
local tamed = false
|
|
||||||
|
|
||||||
local mob_name, mob_type, range
|
|
||||||
|
|
||||||
-- Param 1 resolve
|
|
||||||
if mob and mob ~= "" then
|
|
||||||
if mob == "all" then
|
|
||||||
all = true
|
|
||||||
elseif mob == "passive" or mob == "monster" then
|
|
||||||
mob_type = mob
|
|
||||||
elseif mob then
|
|
||||||
mob_name = mob
|
|
||||||
end
|
|
||||||
--minetest.log ("mob: [" .. mob .. "]")
|
|
||||||
else
|
|
||||||
--minetest.log("No valid first param")
|
|
||||||
if default then
|
|
||||||
--minetest.log("Use default")
|
|
||||||
mob_type = "monster"
|
|
||||||
end
|
|
||||||
--return
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Param 2 resolve
|
|
||||||
if unsafe and unsafe ~= "" then
|
|
||||||
--minetest.log ("unsafe: [" .. unsafe .. "]")
|
|
||||||
if unsafe == "nametagged" then
|
|
||||||
nametagged = true
|
|
||||||
elseif unsafe == "tamed" then
|
|
||||||
tamed = true
|
|
||||||
end
|
|
||||||
|
|
||||||
local num = tonumber(unsafe)
|
|
||||||
if num then range = num end
|
|
||||||
end
|
|
||||||
|
|
||||||
local p = minetest.get_player_by_name(player)
|
|
||||||
|
|
||||||
for _,o in pairs(minetest.luaentities) do
|
for _,o in pairs(minetest.luaentities) do
|
||||||
if o and o.is_mob then
|
if o.is_mob then
|
||||||
local mob_match = false
|
if param == "all" or
|
||||||
|
( param == "nametagged" and o.nametag ) or
|
||||||
if all then
|
( param == "" and ( not o.nametag or o.nametag == "" ) and not o.tamed ) or
|
||||||
--minetest.log("Match - All mobs specified")
|
( num and num > 0 and vector.distance(p:get_pos(),o.object:get_pos()) <= num ) then
|
||||||
mob_match = true
|
o.object:remove()
|
||||||
elseif mob_type then
|
|
||||||
|
|
||||||
--minetest.log("Match - o.type: ".. tostring(o.type))
|
|
||||||
--minetest.log("mob_type: ".. tostring(mob_type))
|
|
||||||
if mob_type == "monster" and o.type == mob_type then
|
|
||||||
--minetest.log("Match - monster")
|
|
||||||
mob_match = true
|
|
||||||
elseif mob_type == "passive" and o.type ~= "monster" and o.type ~= "npc" then
|
|
||||||
--minetest.log("Match - passive")
|
|
||||||
mob_match = true
|
|
||||||
else
|
|
||||||
--minetest.log("No match for type.")
|
|
||||||
end
|
|
||||||
|
|
||||||
elseif mob_name and (o.name == mob_name or string.find(o.name, mob_name)) then
|
|
||||||
--minetest.log("Match - mob_name = ".. tostring(o.name))
|
|
||||||
mob_match = true
|
|
||||||
else
|
|
||||||
--minetest.log("No match - o.type = ".. tostring(o.type))
|
|
||||||
--minetest.log("No match - mob_name = ".. tostring(o.name))
|
|
||||||
--minetest.log("No match - mob_type = ".. tostring(mob_name))
|
|
||||||
end
|
|
||||||
|
|
||||||
if mob_match then
|
|
||||||
local in_range = true
|
|
||||||
if (not range or range <= 0 ) then
|
|
||||||
in_range = true
|
|
||||||
else
|
|
||||||
if ( vector.distance(p:get_pos(),o.object:get_pos()) <= range ) then
|
|
||||||
in_range = true
|
|
||||||
else
|
|
||||||
--minetest.log("Out of range")
|
|
||||||
in_range = false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
--minetest.log("o.nametag: ".. tostring(o.nametag))
|
|
||||||
|
|
||||||
if nametagged then
|
|
||||||
if o.nametag then
|
|
||||||
--minetest.log("Namedtagged and it has a name tag. Kill it")
|
|
||||||
o.object:remove()
|
|
||||||
end
|
|
||||||
elseif tamed then
|
|
||||||
if o.tamed then
|
|
||||||
--minetest.log("Tamed. Kill it")
|
|
||||||
o.object:remove()
|
|
||||||
end
|
|
||||||
elseif in_range and (not o.nametag or o.nametag == "") and not o.tamed then
|
|
||||||
--minetest.log("No nametag or tamed. Kill it")
|
|
||||||
o.object:remove()
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -262,7 +262,6 @@ functions needed for the mob to work properly which contains the following:
|
||||||
'custom_visual_size' will not reset visual_size from the base class on reload
|
'custom_visual_size' will not reset visual_size from the base class on reload
|
||||||
'noyaw' If true this mob will not automatically change yaw
|
'noyaw' If true this mob will not automatically change yaw
|
||||||
'particlespawners' Table of particlespawners attached to the mob. This is implemented in a coord safe manner i.e. spawners are only sent to players within the player_transfer_distance (and automatically removed). This enables infinitely lived particlespawners.
|
'particlespawners' Table of particlespawners attached to the mob. This is implemented in a coord safe manner i.e. spawners are only sent to players within the player_transfer_distance (and automatically removed). This enables infinitely lived particlespawners.
|
||||||
'attack_frequency' Attack frequency in seconds. If unset, this defaults to 1. Implemented for melee only atm.
|
|
||||||
|
|
||||||
mobs:gopath(self,target,callback_arrived) pathfind a way to target and run callback on arrival
|
mobs:gopath(self,target,callback_arrived) pathfind a way to target and run callback on arrival
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
||||||
local mob_class = mcl_mobs.mob_class
|
local mob_class = mcl_mobs.mob_class
|
||||||
|
|
||||||
local HORNY_TIME = 30
|
local HORNY_TIME = 30*20
|
||||||
local HORNY_AGAIN_TIME = 30 -- was 300 or 15*20
|
local HORNY_AGAIN_TIME = 30*20 -- was 300 or 15*20
|
||||||
local CHILD_GROW_TIME = 60
|
local CHILD_GROW_TIME = 60*20
|
||||||
|
|
||||||
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_mobs_villager",false)
|
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_mobs_villager",false)
|
||||||
|
|
||||||
|
@ -74,7 +74,6 @@ function mob_class:feed_tame(clicker, feed_count, breed, tame, notake)
|
||||||
if self.food >= feed_count then
|
if self.food >= feed_count then
|
||||||
self.food = 0
|
self.food = 0
|
||||||
self.horny = true
|
self.horny = true
|
||||||
self.persistent = true
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,6 @@ local stuck_path_timeout = 10 -- how long will mob follow path before giving up
|
||||||
|
|
||||||
local enable_pathfinding = true
|
local enable_pathfinding = true
|
||||||
|
|
||||||
local TIME_TO_FORGET_TARGET = 15
|
|
||||||
|
|
||||||
local atann = math.atan
|
local atann = math.atan
|
||||||
local function atan(x)
|
local function atan(x)
|
||||||
if not x or x ~= x then
|
if not x or x ~= x then
|
||||||
|
@ -21,8 +19,6 @@ local function atan(x)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
mcl_mobs.effect_functions = {}
|
|
||||||
|
|
||||||
|
|
||||||
-- check if daytime and also if mob is docile during daylight hours
|
-- check if daytime and also if mob is docile during daylight hours
|
||||||
function mob_class:day_docile()
|
function mob_class:day_docile()
|
||||||
|
@ -333,7 +329,10 @@ end
|
||||||
|
|
||||||
-- find someone to attack
|
-- find someone to attack
|
||||||
function mob_class:monster_attack()
|
function mob_class:monster_attack()
|
||||||
if not damage_enabled or self.passive ~= false or self.state == "attack" or self:day_docile() then
|
if not damage_enabled
|
||||||
|
or self.passive ~= false
|
||||||
|
or self.state == "attack"
|
||||||
|
or self:day_docile() then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -342,10 +341,8 @@ function mob_class:monster_attack()
|
||||||
local player, obj, min_player
|
local player, obj, min_player
|
||||||
local type, name = "", ""
|
local type, name = "", ""
|
||||||
local min_dist = self.view_range + 1
|
local min_dist = self.view_range + 1
|
||||||
|
|
||||||
local blacklist_attack = {}
|
|
||||||
|
|
||||||
local objs = minetest.get_objects_inside_radius(s, self.view_range)
|
local objs = minetest.get_objects_inside_radius(s, self.view_range)
|
||||||
|
local blacklist_attack = {}
|
||||||
|
|
||||||
for n = 1, #objs do
|
for n = 1, #objs do
|
||||||
if not objs[n]:is_player() then
|
if not objs[n]:is_player() then
|
||||||
|
@ -362,30 +359,32 @@ function mob_class:monster_attack()
|
||||||
end
|
end
|
||||||
|
|
||||||
for n = 1, #objs do
|
for n = 1, #objs do
|
||||||
|
|
||||||
|
|
||||||
if objs[n]:is_player() then
|
if objs[n]:is_player() then
|
||||||
if mcl_mobs.invis[ objs[n]:get_player_name() ] or (not self:object_in_range(objs[n])) then
|
if mcl_mobs.invis[ objs[n]:get_player_name() ] or (not self:object_in_range(objs[n])) then
|
||||||
type = ""
|
type = ""
|
||||||
elseif (self.type == "monster" or self._aggro) then
|
elseif (self.type == "monster" or self._aggro) then
|
||||||
-- self.aggro made player be attacked by npc again if out of range then back in again
|
|
||||||
-- Does it serve a purpose other than that?
|
|
||||||
player = objs[n]
|
player = objs[n]
|
||||||
type = "player"
|
type = "player"
|
||||||
name = "player"
|
name = "player"
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
obj = objs[n]:get_luaentity()
|
obj = objs[n]:get_luaentity()
|
||||||
|
|
||||||
if obj then
|
if obj then
|
||||||
player = obj.object
|
player = obj.object
|
||||||
type = obj.type
|
type = obj.type
|
||||||
name = obj.name or ""
|
name = obj.name or ""
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- find specific mob to attack, failing that attack player/npc/animal
|
-- find specific mob to attack, failing that attack player/npc/animal
|
||||||
if specific_attack(self.specific_attack, name)
|
if specific_attack(self.specific_attack, name)
|
||||||
and (type == "player" or ( type == "npc" and self.attack_npcs )
|
and (type == "player" or ( type == "npc" and self.attack_npcs )
|
||||||
or (type == "animal" and self.attack_animals == true)
|
or (type == "animal" and self.attack_animals == true)) then
|
||||||
or (self.extra_hostile and not self.attack_exception(player))) then
|
|
||||||
p = player:get_pos()
|
p = player:get_pos()
|
||||||
sp = s
|
sp = s
|
||||||
|
|
||||||
|
@ -401,10 +400,10 @@ function mob_class:monster_attack()
|
||||||
attacked_p = true
|
attacked_p = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- choose closest player to attack
|
-- choose closest player to attack
|
||||||
local line_of_sight = self:line_of_sight( sp, p, 2) == true
|
if dist < min_dist
|
||||||
if dist < min_dist and not attacked_p and line_of_sight then
|
and not attacked_p
|
||||||
|
and self:line_of_sight( sp, p, 2) == true then
|
||||||
min_dist = dist
|
min_dist = dist
|
||||||
min_player = player
|
min_player = player
|
||||||
end
|
end
|
||||||
|
@ -435,9 +434,11 @@ function mob_class:npc_attack()
|
||||||
local objs = minetest.get_objects_inside_radius(s, self.view_range)
|
local objs = minetest.get_objects_inside_radius(s, self.view_range)
|
||||||
|
|
||||||
for n = 1, #objs do
|
for n = 1, #objs do
|
||||||
|
|
||||||
obj = objs[n]:get_luaentity()
|
obj = objs[n]:get_luaentity()
|
||||||
|
|
||||||
if obj and obj.type == "monster" then
|
if obj and obj.type == "monster" then
|
||||||
|
|
||||||
p = obj.object:get_pos()
|
p = obj.object:get_pos()
|
||||||
sp = s
|
sp = s
|
||||||
|
|
||||||
|
@ -447,7 +448,8 @@ function mob_class:npc_attack()
|
||||||
p.y = p.y + 1
|
p.y = p.y + 1
|
||||||
sp.y = sp.y + 1
|
sp.y = sp.y + 1
|
||||||
|
|
||||||
if dist < min_dist and self:line_of_sight( sp, p, 2) == true then
|
if dist < min_dist
|
||||||
|
and self:line_of_sight( sp, p, 2) == true then
|
||||||
min_dist = dist
|
min_dist = dist
|
||||||
min_player = obj.object
|
min_player = obj.object
|
||||||
end
|
end
|
||||||
|
@ -794,57 +796,23 @@ end
|
||||||
|
|
||||||
function mob_class:check_aggro(dtime)
|
function mob_class:check_aggro(dtime)
|
||||||
if not self._aggro or not self.attack then return end
|
if not self._aggro or not self.attack then return end
|
||||||
|
if not self._check_aggro_timer or self._check_aggro_timer > 5 then
|
||||||
if not self._check_aggro_timer then
|
|
||||||
self._check_aggro_timer = 0
|
self._check_aggro_timer = 0
|
||||||
end
|
if not self.attack:get_pos() or vector.distance(self.attack:get_pos(),self.object:get_pos()) > 128 then
|
||||||
|
self._aggro = nil
|
||||||
if self._check_aggro_timer > 5 then
|
self.attack = nil
|
||||||
self._check_aggro_timer = 0
|
self.state = "stand"
|
||||||
|
|
||||||
if self.attack then
|
|
||||||
-- TODO consider removing this in favour of what is done in do_states_attack
|
|
||||||
-- Attack is dropped in do_states_attack if out of range, so won't even trigger here
|
|
||||||
-- I do not think this code does anything. Are mobs still loaded in at 128?
|
|
||||||
if not self.attack:get_pos() or vector.distance(self.attack:get_pos(),self.object:get_pos()) > 128 then
|
|
||||||
self._aggro = nil
|
|
||||||
self.attack = nil
|
|
||||||
self.state = "stand"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
self._check_aggro_timer = self._check_aggro_timer + dtime
|
self._check_aggro_timer = self._check_aggro_timer + dtime
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
local function clear_aggro(self)
|
|
||||||
self.state = "stand"
|
|
||||||
self:set_velocity( 0)
|
|
||||||
self:set_animation( "stand")
|
|
||||||
|
|
||||||
self.attack = nil
|
|
||||||
self._aggro = nil
|
|
||||||
|
|
||||||
self.v_start = false
|
|
||||||
self.timer = 0
|
|
||||||
self.blinktimer = 0
|
|
||||||
self.path.way = nil
|
|
||||||
end
|
|
||||||
|
|
||||||
function mob_class:do_states_attack (dtime)
|
function mob_class:do_states_attack (dtime)
|
||||||
self.timer = self.timer + dtime
|
local yaw = self.object:get_yaw() or 0
|
||||||
if self.timer > 100 then
|
|
||||||
self.timer = 1
|
|
||||||
end
|
|
||||||
|
|
||||||
local s = self.object:get_pos()
|
local s = self.object:get_pos()
|
||||||
if not s then return end
|
|
||||||
|
|
||||||
local p = self.attack:get_pos() or s
|
local p = self.attack:get_pos() or s
|
||||||
|
|
||||||
local yaw = self.object:get_yaw() or 0
|
|
||||||
|
|
||||||
-- stop attacking if player invisible or out of range
|
-- stop attacking if player invisible or out of range
|
||||||
if not self.attack
|
if not self.attack
|
||||||
or not self.attack:get_pos()
|
or not self.attack:get_pos()
|
||||||
|
@ -852,53 +820,53 @@ function mob_class:do_states_attack (dtime)
|
||||||
or self.attack:get_hp() <= 0
|
or self.attack:get_hp() <= 0
|
||||||
or (self.attack:is_player() and mcl_mobs.invis[ self.attack:get_player_name() ]) then
|
or (self.attack:is_player() and mcl_mobs.invis[ self.attack:get_player_name() ]) then
|
||||||
|
|
||||||
clear_aggro(self)
|
self.state = "stand"
|
||||||
|
self:set_velocity( 0)
|
||||||
|
self:set_animation( "stand")
|
||||||
|
self.attack = nil
|
||||||
|
self.v_start = false
|
||||||
|
self.timer = 0
|
||||||
|
self.blinktimer = 0
|
||||||
|
self.path.way = nil
|
||||||
|
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local target_line_of_sight = self:target_visible(s)
|
|
||||||
|
|
||||||
if not target_line_of_sight then
|
|
||||||
if self.target_time_lost then
|
|
||||||
local time_since_seen = os.time() - self.target_time_lost
|
|
||||||
if time_since_seen > TIME_TO_FORGET_TARGET then
|
|
||||||
self.target_time_lost = nil
|
|
||||||
clear_aggro(self)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
else
|
|
||||||
self.target_time_lost = os.time()
|
|
||||||
end
|
|
||||||
else
|
|
||||||
self.target_time_lost = nil
|
|
||||||
end
|
|
||||||
|
|
||||||
-- calculate distance from mob and enemy
|
-- calculate distance from mob and enemy
|
||||||
local dist = vector.distance(p, s)
|
local dist = vector.distance(p, s)
|
||||||
|
|
||||||
if self.attack_type == "explode" then
|
if self.attack_type == "explode" then
|
||||||
|
|
||||||
if target_line_of_sight then
|
local vec = {
|
||||||
local vec = { x = p.x - s.x, z = p.z - s.z }
|
x = p.x - s.x,
|
||||||
yaw = (atan(vec.z / vec.x) +math.pi/ 2) - self.rotate
|
z = p.z - s.z
|
||||||
if p.x > s.x then yaw = yaw +math.pi end
|
}
|
||||||
yaw = self:set_yaw( yaw, 0, dtime)
|
|
||||||
end
|
yaw = (atan(vec.z / vec.x) +math.pi/ 2) - self.rotate
|
||||||
|
|
||||||
|
if p.x > s.x then yaw = yaw +math.pi end
|
||||||
|
|
||||||
|
yaw = self:set_yaw( yaw, 0, dtime)
|
||||||
|
|
||||||
local node_break_radius = self.explosion_radius or 1
|
local node_break_radius = self.explosion_radius or 1
|
||||||
local entity_damage_radius = self.explosion_damage_radius
|
local entity_damage_radius = self.explosion_damage_radius
|
||||||
or (node_break_radius * 2)
|
or (node_break_radius * 2)
|
||||||
|
|
||||||
-- start timer when in reach and line of sight
|
-- start timer when in reach and line of sight
|
||||||
if not self.v_start and dist <= self.reach and target_line_of_sight then
|
if not self.v_start
|
||||||
|
and dist <= self.reach
|
||||||
|
and self:line_of_sight( s, p, 2) then
|
||||||
|
|
||||||
self.v_start = true
|
self.v_start = true
|
||||||
self.timer = 0
|
self.timer = 0
|
||||||
self.blinktimer = 0
|
self.blinktimer = 0
|
||||||
self:mob_sound("fuse", nil, false)
|
self:mob_sound("fuse", nil, false)
|
||||||
|
|
||||||
-- stop timer if out of reach or direct line of sight
|
-- stop timer if out of reach or direct line of sight
|
||||||
elseif self.allow_fuse_reset and self.v_start
|
elseif self.allow_fuse_reset
|
||||||
and (dist >= self.explosiontimer_reset_radius or not target_line_of_sight) then
|
and self.v_start
|
||||||
|
and (dist >= self.explosiontimer_reset_radius
|
||||||
|
or not self:line_of_sight( s, p, 2)) then
|
||||||
self.v_start = false
|
self.v_start = false
|
||||||
self.timer = 0
|
self.timer = 0
|
||||||
self.blinktimer = 0
|
self.blinktimer = 0
|
||||||
|
@ -907,10 +875,10 @@ function mob_class:do_states_attack (dtime)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- walk right up to player unless the timer is active
|
-- walk right up to player unless the timer is active
|
||||||
if self.v_start and (self.stop_to_explode or dist < self.reach) or not target_line_of_sight then
|
if self.v_start and (self.stop_to_explode or dist < self.reach) then
|
||||||
self:set_velocity(0)
|
self:set_velocity( 0)
|
||||||
else
|
else
|
||||||
self:set_velocity(self.run_velocity)
|
self:set_velocity( self.run_velocity)
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.animation and self.animation.run_start then
|
if self.animation and self.animation.run_start then
|
||||||
|
@ -920,20 +888,25 @@ function mob_class:do_states_attack (dtime)
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.v_start then
|
if self.v_start then
|
||||||
|
|
||||||
self.timer = self.timer + dtime
|
self.timer = self.timer + dtime
|
||||||
self.blinktimer = (self.blinktimer or 0) + dtime
|
self.blinktimer = (self.blinktimer or 0) + dtime
|
||||||
|
|
||||||
if self.blinktimer > 0.2 then
|
if self.blinktimer > 0.2 then
|
||||||
|
|
||||||
self.blinktimer = 0
|
self.blinktimer = 0
|
||||||
|
|
||||||
if self.blinkstatus then
|
if self.blinkstatus then
|
||||||
self:remove_texture_mod("^[brighten")
|
self:remove_texture_mod("^[brighten")
|
||||||
else
|
else
|
||||||
self:add_texture_mod("^[brighten")
|
self:add_texture_mod("^[brighten")
|
||||||
end
|
end
|
||||||
|
|
||||||
self.blinkstatus = not self.blinkstatus
|
self.blinkstatus = not self.blinkstatus
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.timer > self.explosion_timer then
|
if self.timer > self.explosion_timer then
|
||||||
|
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
|
|
||||||
if mobs_griefing and not minetest.is_protected(pos, "") then
|
if mobs_griefing and not minetest.is_protected(pos, "") then
|
||||||
|
@ -1047,45 +1020,54 @@ function mob_class:do_states_attack (dtime)
|
||||||
|
|
||||||
-- move towards enemy if beyond mob reach
|
-- move towards enemy if beyond mob reach
|
||||||
if dist > self.reach then
|
if dist > self.reach then
|
||||||
|
|
||||||
-- path finding by rnd
|
-- path finding by rnd
|
||||||
if enable_pathfinding and self.pathfinding then
|
if self.pathfinding -- only if mob has pathfinding enabled
|
||||||
|
and enable_pathfinding then
|
||||||
|
|
||||||
self:smart_mobs(s, p, dist, dtime)
|
self:smart_mobs(s, p, dist, dtime)
|
||||||
end
|
end
|
||||||
|
|
||||||
if self:is_at_cliff_or_danger() then
|
if self:is_at_cliff_or_danger() then
|
||||||
|
|
||||||
self:set_velocity( 0)
|
self:set_velocity( 0)
|
||||||
self:set_animation( "stand")
|
self:set_animation( "stand")
|
||||||
local yaw = self.object:get_yaw() or 0
|
local yaw = self.object:get_yaw() or 0
|
||||||
yaw = self:set_yaw( yaw + 0.78, 8)
|
yaw = self:set_yaw( yaw + 0.78, 8)
|
||||||
else
|
else
|
||||||
|
|
||||||
if self.path.stuck then
|
if self.path.stuck then
|
||||||
self:set_velocity(self.walk_velocity)
|
self:set_velocity( self.walk_velocity)
|
||||||
else
|
else
|
||||||
self:set_velocity(self.run_velocity)
|
self:set_velocity( self.run_velocity)
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.animation and self.animation.run_start then
|
if self.animation and self.animation.run_start then
|
||||||
self:set_animation("run")
|
self:set_animation( "run")
|
||||||
else
|
else
|
||||||
self:set_animation("walk")
|
self:set_animation( "walk")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
else -- rnd: if inside reach range
|
else -- rnd: if inside reach range
|
||||||
|
|
||||||
self.path.stuck = false
|
self.path.stuck = false
|
||||||
self.path.stuck_timer = 0
|
self.path.stuck_timer = 0
|
||||||
self.path.following = false -- not stuck anymore
|
self.path.following = false -- not stuck anymore
|
||||||
|
|
||||||
self:set_velocity( 0)
|
self:set_velocity( 0)
|
||||||
|
|
||||||
local attack_frequency = self.attack_frequency or 1
|
if not self.custom_attack then
|
||||||
|
|
||||||
if self.timer > attack_frequency then
|
if self.timer > 1 then
|
||||||
self.timer = 0
|
|
||||||
|
|
||||||
if not self.custom_attack then
|
self.timer = 0
|
||||||
if self.double_melee_attack and math.random(1, 2) == 1 then
|
|
||||||
self:set_animation("punch2")
|
if self.double_melee_attack
|
||||||
|
and math.random(1, 2) == 1 then
|
||||||
|
self:set_animation( "punch2")
|
||||||
else
|
else
|
||||||
self:set_animation("punch")
|
self:set_animation( "punch")
|
||||||
end
|
end
|
||||||
|
|
||||||
local p2 = p
|
local p2 = p
|
||||||
|
@ -1095,6 +1077,8 @@ function mob_class:do_states_attack (dtime)
|
||||||
s2.y = s2.y + .5
|
s2.y = s2.y + .5
|
||||||
|
|
||||||
if self:line_of_sight( p2, s2) == true then
|
if self:line_of_sight( p2, s2) == true then
|
||||||
|
|
||||||
|
-- play attack sound
|
||||||
self:mob_sound("attack")
|
self:mob_sound("attack")
|
||||||
|
|
||||||
-- punch player (or what player is attached to)
|
-- punch player (or what player is attached to)
|
||||||
|
@ -1106,13 +1090,14 @@ function mob_class:do_states_attack (dtime)
|
||||||
full_punch_interval = 1.0,
|
full_punch_interval = 1.0,
|
||||||
damage_groups = {fleshy = self.damage}
|
damage_groups = {fleshy = self.damage}
|
||||||
}, nil)
|
}, nil)
|
||||||
if self.dealt_effect then
|
|
||||||
mcl_mobs.effect_functions[self.dealt_effect.name](
|
|
||||||
self.attack, self.dealt_effect.factor, self.dealt_effect.dur
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
else
|
end
|
||||||
|
else -- call custom attack every second
|
||||||
|
if self.custom_attack
|
||||||
|
and self.timer > 1 then
|
||||||
|
|
||||||
|
self.timer = 0
|
||||||
|
|
||||||
self.custom_attack(self, p)
|
self.custom_attack(self, p)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1138,7 +1123,7 @@ function mob_class:do_states_attack (dtime)
|
||||||
|
|
||||||
yaw = self:set_yaw( yaw, 0, dtime)
|
yaw = self:set_yaw( yaw, 0, dtime)
|
||||||
|
|
||||||
local stay_away_from_player = vector.zero()
|
local stay_away_from_player = vector.new(0,0,0)
|
||||||
|
|
||||||
--strafe back and fourth
|
--strafe back and fourth
|
||||||
|
|
||||||
|
@ -1155,13 +1140,7 @@ function mob_class:do_states_attack (dtime)
|
||||||
if math.random(40) == 1 then
|
if math.random(40) == 1 then
|
||||||
self.strafe_direction = self.strafe_direction*-1
|
self.strafe_direction = self.strafe_direction*-1
|
||||||
end
|
end
|
||||||
|
self.acc = vector.add(vector.multiply(vector.rotate_around_axis(vector.direction(s, p), vector.new(0,1,0), self.strafe_direction), 0.3*self.walk_velocity), stay_away_from_player)
|
||||||
local dir = vector.rotate_around_axis(vector.direction(s, p), vector.new(0,1,0), self.strafe_direction)
|
|
||||||
local dir2 = vector.multiply(dir, 0.3 * self.walk_velocity)
|
|
||||||
|
|
||||||
if dir2 and stay_away_from_player then
|
|
||||||
self.acc = vector.add(dir2, stay_away_from_player)
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
self:set_velocity( 0)
|
self:set_velocity( 0)
|
||||||
end
|
end
|
||||||
|
@ -1217,9 +1196,6 @@ function mob_class:do_states_attack (dtime)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
elseif self.attack_type == "custom" and self.attack_state then
|
|
||||||
self.attack_state(self, dtime)
|
|
||||||
else
|
else
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,16 +1,13 @@
|
||||||
local math, tonumber, vector, minetest, mcl_mobs = math, tonumber, vector, minetest, mcl_mobs
|
local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
||||||
local mob_class = mcl_mobs.mob_class
|
local mob_class = mcl_mobs.mob_class
|
||||||
local validate_vector = mcl_util.validate_vector
|
|
||||||
|
|
||||||
local active_particlespawners = {}
|
local active_particlespawners = {}
|
||||||
local disable_blood = minetest.settings:get_bool("mobs_disable_blood")
|
local disable_blood = minetest.settings:get_bool("mobs_disable_blood")
|
||||||
local DEFAULT_FALL_SPEED = -9.81*1.5
|
local DEFAULT_FALL_SPEED = -9.81*1.5
|
||||||
|
|
||||||
local PATHFINDING = "gowp"
|
|
||||||
|
|
||||||
local player_transfer_distance = tonumber(minetest.settings:get("player_transfer_distance")) or 128
|
local player_transfer_distance = tonumber(minetest.settings:get("player_transfer_distance")) or 128
|
||||||
if player_transfer_distance == 0 then player_transfer_distance = math.huge end
|
if player_transfer_distance == 0 then player_transfer_distance = math.huge end
|
||||||
|
|
||||||
|
|
||||||
-- custom particle effects
|
-- custom particle effects
|
||||||
function mcl_mobs.effect(pos, amount, texture, min_size, max_size, radius, gravity, glow, go_down)
|
function mcl_mobs.effect(pos, amount, texture, min_size, max_size, radius, gravity, glow, go_down)
|
||||||
|
|
||||||
|
@ -130,19 +127,6 @@ function mob_class:mob_sound(soundname, is_opinion, fixed_pitch)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function mob_class:step_opinion_sound(dtime)
|
|
||||||
if self.state ~= "attack" and self.state ~= PATHFINDING then
|
|
||||||
|
|
||||||
if self.opinion_sound_cooloff > 0 then
|
|
||||||
self.opinion_sound_cooloff = self.opinion_sound_cooloff - dtime
|
|
||||||
end
|
|
||||||
-- mob plays random sound at times. Should be 120. Zombie and mob farms are ridiculous
|
|
||||||
if math.random(1, 70) == 1 then
|
|
||||||
self:mob_sound("random", true)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function mob_class:add_texture_mod(mod)
|
function mob_class:add_texture_mod(mod)
|
||||||
local full_mod = ""
|
local full_mod = ""
|
||||||
local already_added = false
|
local already_added = false
|
||||||
|
@ -248,20 +232,16 @@ function mob_class:set_animation(anim, fixed_frame)
|
||||||
if not self.animation or not anim then
|
if not self.animation or not anim then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.jockey and self.object:get_attach() then
|
|
||||||
anim = "jockey"
|
|
||||||
elseif not self.object:get_attach() then
|
|
||||||
self.jockey = nil
|
|
||||||
end
|
|
||||||
|
|
||||||
if self.state == "die" and anim ~= "die" and anim ~= "stand" then
|
if self.state == "die" and anim ~= "die" and anim ~= "stand" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if self.jockey then
|
||||||
|
anim = "jockey"
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
if self.fly and self:flight_check() and anim == "walk" then anim = "fly" end
|
if self:flight_check() and self.fly and anim == "walk" then anim = "fly" end
|
||||||
|
|
||||||
self._current_animation = self._current_animation or ""
|
self._current_animation = self._current_animation or ""
|
||||||
|
|
||||||
|
@ -300,7 +280,7 @@ local function dir_to_pitch(dir)
|
||||||
return -math.atan2(-dir.y, xz)
|
return -math.atan2(-dir.y, xz)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function who_are_you_looking_at (self, dtime)
|
local function who_are_you_looking_at (self)
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
|
|
||||||
local stop_look_at_player_chance = math.random(833/self.curiosity)
|
local stop_look_at_player_chance = math.random(833/self.curiosity)
|
||||||
|
@ -308,26 +288,20 @@ local function who_are_you_looking_at (self, dtime)
|
||||||
|
|
||||||
local stop_look_at_player = stop_look_at_player_chance == 1
|
local stop_look_at_player = stop_look_at_player_chance == 1
|
||||||
|
|
||||||
if self.attack then
|
if self.attack or self.following then
|
||||||
if not self.target_time_lost then
|
self._locked_object = self.attack or self.following
|
||||||
self._locked_object = self.attack
|
|
||||||
else
|
|
||||||
self._locked_object = nil
|
|
||||||
end
|
|
||||||
elseif self.following then
|
|
||||||
self._locked_object = self.following
|
|
||||||
elseif self._locked_object then
|
elseif self._locked_object then
|
||||||
if stop_look_at_player then
|
if stop_look_at_player then
|
||||||
--minetest.log("Stop look: ".. self.name)
|
--minetest.log("Stop look: ".. self.name)
|
||||||
self._locked_object = nil
|
self._locked_object = nil
|
||||||
end
|
end
|
||||||
elseif not self._locked_object then
|
elseif not self._locked_object then
|
||||||
if mcl_util.check_dtime_timer(self, dtime, "step_look_for_someone", 0.2) then
|
if math.random(1, 30) then
|
||||||
--minetest.log("Change look check: ".. self.name)
|
--minetest.log("Change look check: ".. self.name)
|
||||||
|
|
||||||
-- For the wither this was 20/60=0.33, so probably need to rebalance and divide rates.
|
-- For the wither this was 20/60=0.33, so probably need to rebalance and divide rates.
|
||||||
-- but frequency of check isn't good as it is costly. Making others too infrequent requires testing
|
-- but frequency of check isn't good as it is costly. Making others too infrequent requires testing
|
||||||
local chance = 150/self.curiosity
|
local chance = 20/self.curiosity
|
||||||
|
|
||||||
if chance < 1 then chance = 1 end
|
if chance < 1 then chance = 1 end
|
||||||
local look_at_player_chance = math.random(chance)
|
local look_at_player_chance = math.random(chance)
|
||||||
|
@ -358,10 +332,9 @@ end
|
||||||
function mob_class:check_head_swivel(dtime)
|
function mob_class:check_head_swivel(dtime)
|
||||||
if not self.head_swivel or type(self.head_swivel) ~= "string" then return end
|
if not self.head_swivel or type(self.head_swivel) ~= "string" then return end
|
||||||
|
|
||||||
|
who_are_you_looking_at (self)
|
||||||
|
|
||||||
who_are_you_looking_at (self, dtime)
|
local final_rotation = vector.new(0,0,0)
|
||||||
|
|
||||||
local final_rotation = vector.zero()
|
|
||||||
local oldp,oldr = self.object:get_bone_position(self.head_swivel)
|
local oldp,oldr = self.object:get_bone_position(self.head_swivel)
|
||||||
|
|
||||||
if self._locked_object and (self._locked_object:is_player() or self._locked_object:get_luaentity()) and self._locked_object:get_hp() > 0 then
|
if self._locked_object and (self._locked_object:is_player() or self._locked_object:get_luaentity()) and self._locked_object:get_hp() > 0 then
|
||||||
|
@ -373,34 +346,33 @@ function mob_class:check_head_swivel(dtime)
|
||||||
_locked_object_eye_height = self._locked_object:get_properties().eye_height
|
_locked_object_eye_height = self._locked_object:get_properties().eye_height
|
||||||
end
|
end
|
||||||
if _locked_object_eye_height then
|
if _locked_object_eye_height then
|
||||||
|
|
||||||
local self_rot = self.object:get_rotation()
|
local self_rot = self.object:get_rotation()
|
||||||
-- If a mob is attached, should we really be messing with what they are looking at?
|
if self.object:get_attach() then
|
||||||
-- Should this be excluded?
|
|
||||||
if self.object:get_attach() and self.object:get_attach():get_rotation() then
|
|
||||||
self_rot = self.object:get_attach():get_rotation()
|
self_rot = self.object:get_attach():get_rotation()
|
||||||
end
|
end
|
||||||
|
|
||||||
local player_pos = self._locked_object:get_pos()
|
if self.rot then
|
||||||
local direction_player = vector.direction(vector.add(self.object:get_pos(), vector.new(0, self.head_eye_height*.7, 0)), vector.add(player_pos, vector.new(0, _locked_object_eye_height, 0)))
|
local player_pos = self._locked_object:get_pos()
|
||||||
local mob_yaw = math.deg(-(-(self_rot.y)-(-minetest.dir_to_yaw(direction_player))))+self.head_yaw_offset
|
local direction_player = vector.direction(vector.add(self.object:get_pos(), vector.new(0, self.head_eye_height*.7, 0)), vector.add(player_pos, vector.new(0, _locked_object_eye_height, 0)))
|
||||||
local mob_pitch = math.deg(-dir_to_pitch(direction_player))*self.head_pitch_multiplier
|
local mob_yaw = math.deg(-(-(self_rot.y)-(-minetest.dir_to_yaw(direction_player))))+self.head_yaw_offset
|
||||||
|
local mob_pitch = math.deg(-dir_to_pitch(direction_player))*self.head_pitch_multiplier
|
||||||
|
|
||||||
if (mob_yaw < -60 or mob_yaw > 60) and not (self.attack and self.state == "attack" and not self.runaway) then
|
if (mob_yaw < -60 or mob_yaw > 60) and not (self.attack and self.state == "attack" and not self.runaway) then
|
||||||
final_rotation = vector.multiply(oldr, 0.9)
|
final_rotation = vector.multiply(oldr, 0.9)
|
||||||
elseif self.attack and self.state == "attack" and not self.runaway then
|
elseif self.attack and self.state == "attack" and not self.runaway then
|
||||||
if self.head_yaw == "y" then
|
if self.head_yaw == "y" then
|
||||||
final_rotation = vector.new(mob_pitch, mob_yaw, 0)
|
final_rotation = vector.new(mob_pitch, mob_yaw, 0)
|
||||||
elseif self.head_yaw == "z" then
|
elseif self.head_yaw == "z" then
|
||||||
final_rotation = vector.new(mob_pitch, 0, -mob_yaw)
|
final_rotation = vector.new(mob_pitch, 0, -mob_yaw)
|
||||||
end
|
end
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
if self.head_yaw == "y" then
|
if self.head_yaw == "y" then
|
||||||
final_rotation = vector.new(((mob_pitch-oldr.x)*.3)+oldr.x, ((mob_yaw-oldr.y)*.3)+oldr.y, 0)
|
final_rotation = vector.new(((mob_pitch-oldr.x)*.3)+oldr.x, ((mob_yaw-oldr.y)*.3)+oldr.y, 0)
|
||||||
elseif self.head_yaw == "z" then
|
elseif self.head_yaw == "z" then
|
||||||
final_rotation = vector.new(((mob_pitch-oldr.x)*.3)+oldr.x, 0, -(((mob_yaw-oldr.y)*.3)+oldr.y)*3)
|
final_rotation = vector.new(((mob_pitch-oldr.x)*.3)+oldr.x, 0, -(((mob_yaw-oldr.y)*.3)+oldr.y)*3)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -410,11 +382,9 @@ function mob_class:check_head_swivel(dtime)
|
||||||
--final_rotation = vector.new(0,0,0)
|
--final_rotation = vector.new(0,0,0)
|
||||||
end
|
end
|
||||||
|
|
||||||
mcl_util.set_bone_position(self.object,self.head_swivel, vector.new(0,self.bone_eye_height,self.horizontal_head_height), final_rotation)
|
mcl_util.set_bone_position(self.object,self.head_swivel, vector.new(0,self.bone_eye_height,self.horrizonatal_head_height), final_rotation)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function mob_class:set_animation_speed()
|
function mob_class:set_animation_speed()
|
||||||
local v = self.object:get_velocity()
|
local v = self.object:get_velocity()
|
||||||
if v then
|
if v then
|
||||||
|
@ -430,7 +400,7 @@ function mob_class:set_animation_speed()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--set_speed
|
--set_speed
|
||||||
if validate_vector(self.acc) then
|
if self.acc then
|
||||||
self.object:add_velocity(self.acc)
|
self.object:add_velocity(self.acc)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -147,14 +147,13 @@ function mcl_mobs.register_mob(name, def)
|
||||||
head_eye_height = def.head_eye_height or def.bone_eye_height or 0, -- how hight aproximatly the mobs head is fromm the ground to tell the mob how high to look up at the player
|
head_eye_height = def.head_eye_height or def.bone_eye_height or 0, -- how hight aproximatly the mobs head is fromm the ground to tell the mob how high to look up at the player
|
||||||
curiosity = def.curiosity or 1, -- how often mob will look at player on idle
|
curiosity = def.curiosity or 1, -- how often mob will look at player on idle
|
||||||
head_yaw = def.head_yaw or "y", -- axis to rotate head on
|
head_yaw = def.head_yaw or "y", -- axis to rotate head on
|
||||||
horizontal_head_height = def.horizontal_head_height or 0,
|
horrizonatal_head_height = def.horrizonatal_head_height or 0,
|
||||||
wears_armor = def.wears_armor, -- a number value used to index texture slot for armor
|
wears_armor = def.wears_armor, -- a number value used to index texture slot for armor
|
||||||
stepheight = def.stepheight or 0.6,
|
stepheight = def.stepheight or 0.6,
|
||||||
name = name,
|
name = name,
|
||||||
description = def.description,
|
description = def.description,
|
||||||
type = def.type,
|
type = def.type,
|
||||||
attack_type = def.attack_type,
|
attack_type = def.attack_type,
|
||||||
attack_frequency = def.attack_frequency,
|
|
||||||
fly = def.fly or false,
|
fly = def.fly or false,
|
||||||
fly_in = def.fly_in or {"air", "__airlike"},
|
fly_in = def.fly_in or {"air", "__airlike"},
|
||||||
owner = def.owner or "",
|
owner = def.owner or "",
|
||||||
|
@ -217,7 +216,6 @@ function mcl_mobs.register_mob(name, def)
|
||||||
replace_with = def.replace_with,
|
replace_with = def.replace_with,
|
||||||
replace_offset = def.replace_offset or 0,
|
replace_offset = def.replace_offset or 0,
|
||||||
on_replace = def.on_replace,
|
on_replace = def.on_replace,
|
||||||
replace_delay = def.replace_delay or 0,
|
|
||||||
timer = 0,
|
timer = 0,
|
||||||
env_damage_timer = 0,
|
env_damage_timer = 0,
|
||||||
tamed = false,
|
tamed = false,
|
||||||
|
@ -287,7 +285,6 @@ function mcl_mobs.register_mob(name, def)
|
||||||
spawn_in_group_min = def.spawn_in_group_min,
|
spawn_in_group_min = def.spawn_in_group_min,
|
||||||
noyaw = def.noyaw or false,
|
noyaw = def.noyaw or false,
|
||||||
particlespawners = def.particlespawners,
|
particlespawners = def.particlespawners,
|
||||||
spawn_check = def.spawn_check,
|
|
||||||
-- End of MCL2 extensions
|
-- End of MCL2 extensions
|
||||||
on_spawn = def.on_spawn,
|
on_spawn = def.on_spawn,
|
||||||
on_blast = def.on_blast or function(self,damage)
|
on_blast = def.on_blast or function(self,damage)
|
||||||
|
@ -298,7 +295,6 @@ function mcl_mobs.register_mob(name, def)
|
||||||
return false, true, {}
|
return false, true, {}
|
||||||
end,
|
end,
|
||||||
do_punch = def.do_punch,
|
do_punch = def.do_punch,
|
||||||
deal_damage = def.deal_damage,
|
|
||||||
on_breed = def.on_breed,
|
on_breed = def.on_breed,
|
||||||
on_grown = def.on_grown,
|
on_grown = def.on_grown,
|
||||||
on_pick_up = def.on_pick_up,
|
on_pick_up = def.on_pick_up,
|
||||||
|
@ -313,15 +309,8 @@ function mcl_mobs.register_mob(name, def)
|
||||||
|
|
||||||
return self:mob_activate(staticdata, def, dtime)
|
return self:mob_activate(staticdata, def, dtime)
|
||||||
end,
|
end,
|
||||||
attack_state = def.attack_state,
|
|
||||||
harmed_by_heal = def.harmed_by_heal,
|
harmed_by_heal = def.harmed_by_heal,
|
||||||
is_boss = def.is_boss,
|
on_lightning_strike = def.on_lightning_strike
|
||||||
dealt_effect = def.dealt_effect,
|
|
||||||
on_lightning_strike = def.on_lightning_strike,
|
|
||||||
extra_hostile = def.extra_hostile,
|
|
||||||
attack_exception = def.attack_exception or function(p) return false end,
|
|
||||||
|
|
||||||
_spawner = def._spawner,
|
|
||||||
}
|
}
|
||||||
minetest.register_entity(name, setmetatable(final_def,mcl_mobs.mob_class_meta))
|
minetest.register_entity(name, setmetatable(final_def,mcl_mobs.mob_class_meta))
|
||||||
|
|
||||||
|
@ -352,10 +341,9 @@ function mcl_mobs.register_arrow(name, def)
|
||||||
collisionbox = {0, 0, 0, 0, 0, 0}, -- remove box around arrows
|
collisionbox = {0, 0, 0, 0, 0, 0}, -- remove box around arrows
|
||||||
timer = 0,
|
timer = 0,
|
||||||
switch = 0,
|
switch = 0,
|
||||||
_lifetime = def._lifetime or 150,
|
|
||||||
owner_id = def.owner_id,
|
owner_id = def.owner_id,
|
||||||
rotate = def.rotate,
|
rotate = def.rotate,
|
||||||
on_punch = def.on_punch or function(self)
|
on_punch = function(self)
|
||||||
local vel = self.object:get_velocity()
|
local vel = self.object:get_velocity()
|
||||||
self.object:set_velocity({x=vel.x * -1, y=vel.y * -1, z=vel.z * -1})
|
self.object:set_velocity({x=vel.x * -1, y=vel.y * -1, z=vel.z * -1})
|
||||||
end,
|
end,
|
||||||
|
@ -372,7 +360,7 @@ function mcl_mobs.register_arrow(name, def)
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
|
|
||||||
if self.switch == 0
|
if self.switch == 0
|
||||||
or self.timer > self._lifetime
|
or self.timer > 150
|
||||||
or not within_limits(pos, 0) then
|
or not within_limits(pos, 0) then
|
||||||
mcl_burning.extinguish(self.object)
|
mcl_burning.extinguish(self.object)
|
||||||
self.object:remove();
|
self.object:remove();
|
||||||
|
@ -509,11 +497,12 @@ function mcl_mobs.register_egg(mob, desc, background_color, overlay_color, addeg
|
||||||
return def.on_rightclick(pointed_thing.under, under, placer, itemstack)
|
return def.on_rightclick(pointed_thing.under, under, placer, itemstack)
|
||||||
end
|
end
|
||||||
|
|
||||||
if pos and within_limits(pos, 0) and not minetest.is_protected(pos, placer:get_player_name()) then
|
if pos
|
||||||
|
and within_limits(pos, 0)
|
||||||
|
and not minetest.is_protected(pos, placer:get_player_name()) then
|
||||||
|
|
||||||
local name = placer:get_player_name()
|
local name = placer:get_player_name()
|
||||||
local privs = minetest.get_player_privs(name)
|
local privs = minetest.get_player_privs(name)
|
||||||
|
|
||||||
|
|
||||||
if under.name == "mcl_mobspawners:spawner" then
|
if under.name == "mcl_mobspawners:spawner" then
|
||||||
if minetest.is_protected(pointed_thing.under, name) then
|
if minetest.is_protected(pointed_thing.under, name) then
|
||||||
minetest.record_protection_violation(pointed_thing.under, name)
|
minetest.record_protection_violation(pointed_thing.under, name)
|
||||||
|
@ -523,14 +512,7 @@ function mcl_mobs.register_egg(mob, desc, background_color, overlay_color, addeg
|
||||||
minetest.chat_send_player(name, S("You need the “maphack” privilege to change the mob spawner."))
|
minetest.chat_send_player(name, S("You need the “maphack” privilege to change the mob spawner."))
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
|
mcl_mobspawners.setup_spawner(pointed_thing.under, itemstack:get_name())
|
||||||
local dim = mcl_worlds.pos_to_dimension(placer:get_pos())
|
|
||||||
local mob_light_lvl = {mcl_mobs:mob_light_lvl(itemstack:get_name(),dim)}
|
|
||||||
|
|
||||||
--minetest.log("min light: " .. mob_light_lvl[1])
|
|
||||||
--minetest.log("max light: " .. mob_light_lvl[2])
|
|
||||||
|
|
||||||
mcl_mobspawners.setup_spawner(pointed_thing.under, itemstack:get_name(), mob_light_lvl[1], mob_light_lvl[2])
|
|
||||||
if not minetest.is_creative_enabled(name) then
|
if not minetest.is_creative_enabled(name) then
|
||||||
itemstack:take_item()
|
itemstack:take_item()
|
||||||
end
|
end
|
||||||
|
@ -568,7 +550,7 @@ function mcl_mobs.register_egg(mob, desc, background_color, overlay_color, addeg
|
||||||
nametag = string.sub(nametag, 1, MAX_MOB_NAME_LENGTH)
|
nametag = string.sub(nametag, 1, MAX_MOB_NAME_LENGTH)
|
||||||
end
|
end
|
||||||
ent.nametag = nametag
|
ent.nametag = nametag
|
||||||
ent:update_tag()
|
update_tag(ent)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- if not in creative then take item
|
-- if not in creative then take item
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
# textdomain: mcl_mobs
|
|
||||||
Peaceful mode active! No monsters will spawn.=Fredelig tilstand aktiveret! Ingen monstre vil spawne.
|
|
||||||
This allows you to place a single mob.=Dette gør dig i stand til at placere et enkelt monster.
|
|
||||||
Just place it where you want the mob to appear. Animals will spawn tamed, unless you hold down the sneak key while placing. If you place this on a mob spawner, you change the mob it spawns.=Placér det blot der hvor du ønsker, at monsteret skal komme. Dyr vil spawne tamme, medmindre du holder snige-knappen nede mens du placerer dem. Hvis du placerer denne på et monsterspawn, ændrer du hvilket monster det spawner.
|
|
||||||
You need the “maphack” privilege to change the mob spawner.=Du skal have "maphack" privilegier for at ændre monsterspawneren.
|
|
||||||
Name Tag=Navneskilt
|
|
||||||
A name tag is an item to name a mob.=Et navneskilt bruges til at navngive et monster.
|
|
||||||
Before you use the name tag, you need to set a name at an anvil. Then you can use the name tag to name a mob. This uses up the name tag.=Før du bruger navneskiltet, skal du vælge navnet ved en ambolt. Derefter kan du bruge navneskiltet til at navngive et monster. Dette opbruger navneskiltet.
|
|
||||||
Only peaceful mobs allowed!=Kun fredelige monstre er tilladt!
|
|
||||||
Give names to mobs=Giv navne til monstre
|
|
||||||
Set name at anvil=Vælg navn ved en ambolt.
|
|
|
@ -9,5 +9,3 @@ Before you use the name tag, you need to set a name at an anvil. Then you can us
|
||||||
Only peaceful mobs allowed!=Seuls les mobs pacifiques sont autorisées!
|
Only peaceful mobs allowed!=Seuls les mobs pacifiques sont autorisées!
|
||||||
Give names to mobs=Donne des noms aux mobs
|
Give names to mobs=Donne des noms aux mobs
|
||||||
Set name at anvil=Définir le nom sur l'enclume
|
Set name at anvil=Définir le nom sur l'enclume
|
||||||
Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to select only nametagged/tamed mobs, or a range to specify a maximum distance from the player.=Enlève les mobs spécifiés sauf ceux qui sont nommés et apprivoisés. Pour le deuxième paramètre, utiliser nametagged/tamed pour ne sélectionner que les mobs nommés/apprivoisés, ou une distance pour spécifier la distance maximale par rapport au joueur.
|
|
||||||
Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=Usage par défaut. Enlève les mobs hostiles. Pour plus d'options saisir : /help clearmobs
|
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
# textdomain: mcl_mobs
|
# textdomain: mcl_mobs
|
||||||
Peaceful mode active! No monsters will spawn.=Мирный режим включён! Монстры не будут спауниться.
|
Peaceful mode active! No monsters will spawn.=Мирный режим включён! Монстры не будут появляться.
|
||||||
This allows you to place a single mob.=Позволяет вам заспаунить одного моба.
|
This allows you to place a single mob.=Позволяет вам разместить одного моба.
|
||||||
Just place it where you want the mob to appear. Animals will spawn tamed, unless you hold down the sneak key while placing. If you place this on a mob spawner, you change the mob it spawns.=Используйте предмет там, где вы хотите, чтобы заспаунился моб. Животные будут спауниться уже прирученные, если только вы не удерживаете клавишу [Красться] при размещении. Если использовать на спаунере мобов, изменится создаваемый им моб.
|
Just place it where you want the mob to appear. Animals will spawn tamed, unless you hold down the sneak key while placing. If you place this on a mob spawner, you change the mob it spawns.=Просто поместите это туда, где хотите, чтобы появился моб. Животные будут появляться уже прирученные, если это не нужно, удерживайте клавишу [Красться] при размещении. Если поместить это на спаунер, появляющийся из него моб будет изменён.
|
||||||
You need the “maphack” privilege to change the mob spawner.=Вам нужна привилегия “maphack”, чтобы изменить спаунер мобов.
|
You need the “maphack” privilege to change the mob spawner.=Вам нужно обладать привилегией “maphack”, чтобы изменить спаунер моба.
|
||||||
Name Tag=Бирка
|
Name Tag=Именная бирка
|
||||||
A name tag is an item to name a mob.=Бирка это предмет, дающий мобу имя.
|
A name tag is an item to name a mob.=Именная бирка это предмет, чтобы дать мобу имя.
|
||||||
Before you use the name tag, you need to set a name at an anvil. Then you can use the name tag to name a mob. This uses up the name tag.=Прежде чем использовать бирку, нужно задать ей имя на наковальне. Тогда вы сможете использовать бирку, чтобы дать имя мобу.
|
Before you use the name tag, you need to set a name at an anvil. Then you can use the name tag to name a mob. This uses up the name tag.=Прежде чем использовать именную бирку, нужно задать имя на наковальне. Тогда вы сможете использовать бирку, чтобы дать имя мобу.
|
||||||
Only peaceful mobs allowed!=Разрешены только мирные мобы!
|
Only peaceful mobs allowed!=Разрешены только мирные мобы!
|
||||||
Give names to mobs=Даёт имена мобам
|
Give names to mobs=Даёт имена мобам
|
||||||
Set name at anvil=Задайте имя на наковальне
|
Set name at anvil=Задайте имя при помощи наковальни
|
||||||
Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to select only nametagged/tamed mobs, or a range to specify a maximum distance from the player.=Удаляет указанных мобов кроме именованных и прирученных. Для второго параметра используйте nametagged/tamed, чтобы выбрать именованных/прирученных мобов или радиус указывающий максимальную дистанцию от игрока.
|
|
||||||
Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=Параметры по умолчанию. Удаляем враждебных мобов. Для дополнительных опций введите: /help clearmobs
|
|
||||||
|
|
|
@ -9,5 +9,3 @@ Before you use the name tag, you need to set a name at an anvil. Then you can us
|
||||||
Only peaceful mobs allowed!=
|
Only peaceful mobs allowed!=
|
||||||
Give names to mobs=
|
Give names to mobs=
|
||||||
Set name at anvil=
|
Set name at anvil=
|
||||||
Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to select only nametagged/tamed mobs, or a range to specify a maximum distance from the player.=
|
|
||||||
Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=
|
|
||||||
|
|
|
@ -2,4 +2,4 @@ name = mcl_mobs
|
||||||
author = PilzAdam
|
author = PilzAdam
|
||||||
description = Adds a mob API for mods to add animals or monsters, etc.
|
description = Adds a mob API for mods to add animals or monsters, etc.
|
||||||
depends = mcl_particles
|
depends = mcl_particles
|
||||||
optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, lucky_block, cmi, doc_identifier, mcl_armor, mcl_portals, mcl_experience, mcl_sculk
|
optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, lucky_block, cmi, doc_identifier, mcl_armor, mcl_portals, mcl_experience
|
||||||
|
|
|
@ -3,13 +3,13 @@ local mob_class = mcl_mobs.mob_class
|
||||||
local DEFAULT_FALL_SPEED = -9.81*1.5
|
local DEFAULT_FALL_SPEED = -9.81*1.5
|
||||||
local FLOP_HEIGHT = 6
|
local FLOP_HEIGHT = 6
|
||||||
local FLOP_HOR_SPEED = 1.5
|
local FLOP_HOR_SPEED = 1.5
|
||||||
|
|
||||||
local CHECK_HERD_FREQUENCY = 4
|
|
||||||
|
|
||||||
local PATHFINDING = "gowp"
|
local PATHFINDING = "gowp"
|
||||||
|
|
||||||
|
local node_ice = "mcl_core:ice"
|
||||||
|
local node_snowblock = "mcl_core:snowblock"
|
||||||
local node_snow = "mcl_core:snow"
|
local node_snow = "mcl_core:snow"
|
||||||
|
|
||||||
|
|
||||||
local mobs_griefing = minetest.settings:get_bool("mobs_griefing") ~= false
|
local mobs_griefing = minetest.settings:get_bool("mobs_griefing") ~= false
|
||||||
|
|
||||||
local atann = math.atan
|
local atann = math.atan
|
||||||
|
@ -21,19 +21,14 @@ local function atan(x)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local registered_fallback_node = minetest.registered_nodes[mcl_mobs.fallback_node]
|
|
||||||
|
|
||||||
-- get node but use fallback for nil or unknown
|
-- get node but use fallback for nil or unknown
|
||||||
local node_ok = function(pos, fallback)
|
local node_ok = function(pos, fallback)
|
||||||
|
fallback = fallback or mcl_mobs.fallback_node
|
||||||
local node = minetest.get_node_or_nil(pos)
|
local node = minetest.get_node_or_nil(pos)
|
||||||
if node and minetest.registered_nodes[node.name] then
|
if node and minetest.registered_nodes[node.name] then
|
||||||
return node
|
return node
|
||||||
end
|
end
|
||||||
if fallback then
|
return minetest.registered_nodes[fallback]
|
||||||
return minetest.registered_nodes[fallback]
|
|
||||||
else
|
|
||||||
return registered_fallback_node
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Returns true is node can deal damage to self
|
-- Returns true is node can deal damage to self
|
||||||
|
@ -76,67 +71,6 @@ function mob_class:is_node_waterhazard(nodename)
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
local function raycast_line_of_sight (origin, target)
|
|
||||||
local raycast = minetest.raycast(origin, target, false, true)
|
|
||||||
|
|
||||||
local los_blocked = false
|
|
||||||
|
|
||||||
for hitpoint in raycast do
|
|
||||||
if hitpoint.type == "node" then
|
|
||||||
--TODO type object could block vision, for example chests
|
|
||||||
local node = minetest.get_node(minetest.get_pointed_thing_position(hitpoint))
|
|
||||||
|
|
||||||
if node.name ~= "air" then
|
|
||||||
local nodef = minetest.registered_nodes[node.name]
|
|
||||||
if nodef and nodef.walkable then
|
|
||||||
los_blocked = true
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return not los_blocked
|
|
||||||
end
|
|
||||||
|
|
||||||
function mob_class:target_visible(origin)
|
|
||||||
if not origin then return end
|
|
||||||
|
|
||||||
if not self.attack then return end
|
|
||||||
local target_pos = self.attack:get_pos()
|
|
||||||
|
|
||||||
if not target_pos then return end
|
|
||||||
|
|
||||||
local origin_eye_pos = vector.offset(origin, 0, self.head_eye_height, 0)
|
|
||||||
|
|
||||||
--minetest.log("origin: " .. dump(origin))
|
|
||||||
--minetest.log("origin_eye_pos: " .. dump(origin_eye_pos))
|
|
||||||
|
|
||||||
local targ_head_height, targ_feet_height
|
|
||||||
if self.attack:is_player() then
|
|
||||||
local cbox = self.object:get_properties().collisionbox
|
|
||||||
targ_head_height = vector.offset(target_pos, 0, cbox[5], 0)
|
|
||||||
targ_feet_height = target_pos -- Cbox would put feet under ground which interferes with ray
|
|
||||||
else
|
|
||||||
targ_head_height = vector.offset(target_pos, 0, self.collisionbox[5], 0)
|
|
||||||
targ_feet_height = vector.offset(target_pos, 0, self.collisionbox[2], 0)
|
|
||||||
end
|
|
||||||
|
|
||||||
--minetest.log("start targ_head_height: " .. dump(targ_head_height))
|
|
||||||
if raycast_line_of_sight (origin_eye_pos, targ_head_height) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
--minetest.log("Start targ_feet_height: " .. dump(targ_feet_height))
|
|
||||||
if raycast_line_of_sight (origin_eye_pos, targ_feet_height) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
-- TODO mid way between feet and head
|
|
||||||
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
-- check line of sight (BrunoMine)
|
-- check line of sight (BrunoMine)
|
||||||
function mob_class:line_of_sight(pos1, pos2, stepsize)
|
function mob_class:line_of_sight(pos1, pos2, stepsize)
|
||||||
|
|
||||||
|
@ -267,21 +201,19 @@ end
|
||||||
|
|
||||||
-- is mob facing a cliff or danger
|
-- is mob facing a cliff or danger
|
||||||
function mob_class:is_at_cliff_or_danger()
|
function mob_class:is_at_cliff_or_danger()
|
||||||
if self.fear_height == 0 or self._jumping_cliff or self._can_jump_cliff or not self.object:get_luaentity() then -- 0 for no falling protection!
|
if self.fear_height == 0 or self:can_jump_cliff() or self._jumping_cliff or not self.object:get_luaentity() then -- 0 for no falling protection!
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
local yaw = self.object:get_yaw()
|
local yaw = self.object:get_yaw()
|
||||||
local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)
|
local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)
|
||||||
local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)
|
local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)
|
||||||
|
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
local ypos = pos.y + self.collisionbox[2] -- just above floor
|
local ypos = pos.y + self.collisionbox[2] -- just above floor
|
||||||
|
|
||||||
local free_fall, blocker = minetest.line_of_sight(
|
local free_fall, blocker = minetest.line_of_sight(
|
||||||
vector.new(pos.x + dir_x, ypos, pos.z + dir_z),
|
{x = pos.x + dir_x, y = ypos, z = pos.z + dir_z},
|
||||||
vector.new(pos.x + dir_x, ypos - self.fear_height, pos.z + dir_z))
|
{x = pos.x + dir_x, y = ypos - self.fear_height, z = pos.z + dir_z})
|
||||||
|
|
||||||
if free_fall then
|
if free_fall then
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
|
@ -303,80 +235,63 @@ end
|
||||||
|
|
||||||
-- copy the 'mob facing cliff_or_danger check' from above, and rework to avoid water
|
-- copy the 'mob facing cliff_or_danger check' from above, and rework to avoid water
|
||||||
function mob_class:is_at_water_danger()
|
function mob_class:is_at_water_danger()
|
||||||
if self.water_damage == 0 and self.breath_max == -1 then
|
if not self.object:get_luaentity() or self:can_jump_cliff() or self._jumping_cliff then
|
||||||
--minetest.log("Do not need a water check for: " .. self.name)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local in_water_danger = self:is_node_waterhazard(self.standing_in) or self:is_node_waterhazard(self.standing_on)
|
|
||||||
if in_water_danger then return false end -- If you're in trouble, do not stop
|
|
||||||
|
|
||||||
if not self.object:get_luaentity() or self._jumping_cliff or self._can_jump_cliff then
|
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
local yaw = self.object:get_yaw()
|
local yaw = self.object:get_yaw()
|
||||||
local pos = self.object:get_pos()
|
|
||||||
|
|
||||||
if not yaw or not pos then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)
|
local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)
|
||||||
local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)
|
local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)
|
||||||
|
local pos = self.object:get_pos()
|
||||||
local ypos = pos.y + self.collisionbox[2] -- just above floor
|
local ypos = pos.y + self.collisionbox[2] -- just above floor
|
||||||
|
|
||||||
local los, blocker = minetest.line_of_sight(
|
local free_fall, blocker = minetest.line_of_sight(
|
||||||
vector.new(pos.x + dir_x, ypos, pos.z + dir_z),
|
{x = pos.x + dir_x, y = ypos, z = pos.z + dir_z},
|
||||||
vector.new(pos.x + dir_x, ypos - 3, pos.z + dir_z))
|
{x = pos.x + dir_x, y = ypos - 3, z = pos.z + dir_z})
|
||||||
|
if free_fall then
|
||||||
if not los then
|
return true
|
||||||
|
else
|
||||||
local bnode = minetest.get_node(blocker)
|
local bnode = minetest.get_node(blocker)
|
||||||
local waterdanger = self:is_node_waterhazard(bnode.name)
|
local waterdanger = self:is_node_waterhazard(bnode.name)
|
||||||
|
if
|
||||||
if waterdanger and not in_water_danger then
|
waterdanger and (self:is_node_waterhazard(self.standing_in) or self:is_node_waterhazard( self.standing_on)) then
|
||||||
|
return false
|
||||||
|
elseif waterdanger and (self:is_node_waterhazard(self.standing_in) or self:is_node_waterhazard(self.standing_on)) == false then
|
||||||
return true
|
return true
|
||||||
|
else
|
||||||
|
local def = minetest.registered_nodes[bnode.name]
|
||||||
|
if def and def.walkable then
|
||||||
|
return false
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
function mob_class:env_danger_movement_checks(player_in_active_range)
|
function mob_class:env_danger_movement_checks(dtime)
|
||||||
local yaw = 0
|
local yaw = 0
|
||||||
|
if self:is_at_water_danger() and self.state ~= "attack" then
|
||||||
if not player_in_active_range then return end
|
if math.random(1, 10) <= 6 then
|
||||||
|
|
||||||
if self.state == PATHFINDING
|
|
||||||
or self.state == "attack"
|
|
||||||
or self.state == "stand"
|
|
||||||
or self.state == "runaway" then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
if self:is_at_water_danger() then
|
|
||||||
--minetest.log("At water danger for mob, stop?: " .. self.name)
|
|
||||||
if math.random(1, 10) <= 7 then
|
|
||||||
if self.state ~= "stand" then
|
|
||||||
self:set_velocity(0)
|
|
||||||
self.state = "stand"
|
|
||||||
self:set_animation( "stand")
|
|
||||||
end
|
|
||||||
yaw = yaw + math.random(-0.5, 0.5)
|
|
||||||
yaw = self:set_yaw( yaw, 8)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
--[[if self:is_at_cliff_or_danger(can_jump_cliff) then
|
|
||||||
if self.state ~= "stand" then
|
|
||||||
self:set_velocity(0)
|
self:set_velocity(0)
|
||||||
self.state = "stand"
|
self.state = "stand"
|
||||||
self:set_animation( "stand")
|
self:set_animation( "stand")
|
||||||
|
yaw = yaw + math.random(-0.5, 0.5)
|
||||||
|
yaw = self:set_yaw( yaw, 8)
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
-- This code should probably be moved to movement code
|
||||||
|
if self.move_in_group ~= false then
|
||||||
|
self:check_herd(dtime)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if self:is_at_cliff_or_danger() then
|
||||||
|
self:set_velocity(0)
|
||||||
|
self.state = "stand"
|
||||||
|
self:set_animation( "stand")
|
||||||
local yaw = self.object:get_yaw() or 0
|
local yaw = self.object:get_yaw() or 0
|
||||||
yaw = self:set_yaw( yaw + 0.78, 8)
|
yaw = self:set_yaw( yaw + 0.78, 8)
|
||||||
end--]]
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- jump if facing a solid node (not fences or gates)
|
-- jump if facing a solid node (not fences or gates)
|
||||||
|
@ -416,11 +331,9 @@ function mob_class:do_jump()
|
||||||
jump_c_multiplier = v2/self.walk_velocity/2
|
jump_c_multiplier = v2/self.walk_velocity/2
|
||||||
end
|
end
|
||||||
|
|
||||||
local yaw_dir = minetest.yaw_to_dir(self.object:get_yaw())
|
|
||||||
|
|
||||||
-- where is front
|
-- where is front
|
||||||
local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+yaw_dir.x
|
local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+0.6
|
||||||
local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+yaw_dir.z
|
local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)*jump_c_multiplier+0.6
|
||||||
|
|
||||||
-- what is in front of mob?
|
-- what is in front of mob?
|
||||||
nod = node_ok({
|
nod = node_ok({
|
||||||
|
@ -449,7 +362,7 @@ function mob_class:do_jump()
|
||||||
end
|
end
|
||||||
|
|
||||||
local ndef = minetest.registered_nodes[nod.name]
|
local ndef = minetest.registered_nodes[nod.name]
|
||||||
if self.walk_chance == 0 or ndef and ndef.walkable or self._can_jump_cliff then
|
if self.walk_chance == 0 or ndef and ndef.walkable or self:can_jump_cliff() then
|
||||||
|
|
||||||
if minetest.get_item_group(nod.name, "fence") == 0
|
if minetest.get_item_group(nod.name, "fence") == 0
|
||||||
and minetest.get_item_group(nod.name, "fence_gate") == 0
|
and minetest.get_item_group(nod.name, "fence_gate") == 0
|
||||||
|
@ -459,7 +372,7 @@ function mob_class:do_jump()
|
||||||
|
|
||||||
v.y = self.jump_height + 0.1 * 3
|
v.y = self.jump_height + 0.1 * 3
|
||||||
|
|
||||||
if self._can_jump_cliff then
|
if self:can_jump_cliff() then
|
||||||
v=vector.multiply(v, vector.new(2.8,1,2.8))
|
v=vector.multiply(v, vector.new(2.8,1,2.8))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -541,8 +454,7 @@ end
|
||||||
|
|
||||||
|
|
||||||
-- find and replace what mob is looking for (grass, wheat etc.)
|
-- find and replace what mob is looking for (grass, wheat etc.)
|
||||||
function mob_class:replace_node(pos)
|
function mob_class:replace(pos)
|
||||||
|
|
||||||
|
|
||||||
if not self.replace_rate
|
if not self.replace_rate
|
||||||
or not self.replace_what
|
or not self.replace_what
|
||||||
|
@ -574,21 +486,18 @@ function mob_class:replace_node(pos)
|
||||||
|
|
||||||
local oldnode = {name = what, param2 = node.param2}
|
local oldnode = {name = what, param2 = node.param2}
|
||||||
local newnode = {name = with, param2 = node.param2}
|
local newnode = {name = with, param2 = node.param2}
|
||||||
local on_replace_return = false
|
local on_replace_return
|
||||||
|
|
||||||
if self.on_replace then
|
if self.on_replace then
|
||||||
on_replace_return = self.on_replace(self, pos, oldnode, newnode)
|
on_replace_return = self.on_replace(self, pos, oldnode, newnode)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
if on_replace_return ~= false then
|
if on_replace_return ~= false then
|
||||||
|
|
||||||
if mobs_griefing then
|
if mobs_griefing then
|
||||||
minetest.after(self.replace_delay, function()
|
minetest.set_node(pos, newnode)
|
||||||
if self and self.object and self.object:get_velocity() and self.health > 0 then
|
|
||||||
minetest.set_node(pos, newnode)
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -698,52 +607,76 @@ function mob_class:check_runaway_from()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
-- follow player if owner or holding item
|
-- follow player if owner or holding item, if fish outta water then flop
|
||||||
function mob_class:check_follow()
|
function mob_class:follow_flop()
|
||||||
|
|
||||||
-- find player to follow
|
-- find player to follow
|
||||||
if (self.follow ~= "" or self.order == "follow") and not self.following
|
if (self.follow ~= ""
|
||||||
|
or self.order == "follow")
|
||||||
|
and not self.following
|
||||||
and self.state ~= "attack"
|
and self.state ~= "attack"
|
||||||
and self.order ~= "sit"
|
and self.order ~= "sit"
|
||||||
and self.state ~= "runaway" then
|
and self.state ~= "runaway" then
|
||||||
|
|
||||||
local s = self.object:get_pos()
|
local s = self.object:get_pos()
|
||||||
local players = minetest.get_connected_players()
|
local players = minetest.get_connected_players()
|
||||||
|
|
||||||
for n = 1, #players do
|
for n = 1, #players do
|
||||||
if (self:object_in_range(players[n])) and not mcl_mobs.invis[ players[n]:get_player_name() ] then
|
|
||||||
|
if (self:object_in_range(players[n]))
|
||||||
|
and not mcl_mobs.invis[ players[n]:get_player_name() ] then
|
||||||
|
|
||||||
self.following = players[n]
|
self.following = players[n]
|
||||||
|
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.type == "npc" and self.order == "follow"
|
if self.type == "npc"
|
||||||
and self.state ~= "attack" and self.order ~= "sit" and self.owner ~= "" then
|
and self.order == "follow"
|
||||||
|
and self.state ~= "attack"
|
||||||
|
and self.order ~= "sit"
|
||||||
|
and self.owner ~= "" then
|
||||||
|
|
||||||
if self.following and self.owner and self.owner ~= self.following:get_player_name() then
|
-- npc stop following player if not owner
|
||||||
|
if self.following
|
||||||
|
and self.owner
|
||||||
|
and self.owner ~= self.following:get_player_name() then
|
||||||
self.following = nil
|
self.following = nil
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
-- stop following player if not holding specific item,
|
-- stop following player if not holding specific item,
|
||||||
-- mob is horny, fleeing or attacking
|
-- mob is horny, fleeing or attacking
|
||||||
if self.following and self.following:is_player()
|
if self.following
|
||||||
and (self:follow_holding(self.following) == false or self.horny or self.state == "runaway") then
|
and self.following:is_player()
|
||||||
|
and (self:follow_holding(self.following) == false or
|
||||||
|
self.horny or self.state == "runaway") then
|
||||||
self.following = nil
|
self.following = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- follow that thing
|
-- follow that thing
|
||||||
if self.following then
|
if self.following then
|
||||||
local s = self.object:get_pos()
|
|
||||||
|
|
||||||
|
local s = self.object:get_pos()
|
||||||
local p
|
local p
|
||||||
|
|
||||||
if self.following:is_player() then
|
if self.following:is_player() then
|
||||||
|
|
||||||
p = self.following:get_pos()
|
p = self.following:get_pos()
|
||||||
|
|
||||||
elseif self.following.object then
|
elseif self.following.object then
|
||||||
|
|
||||||
p = self.following.object:get_pos()
|
p = self.following.object:get_pos()
|
||||||
end
|
end
|
||||||
|
|
||||||
if p then
|
if p then
|
||||||
|
|
||||||
local dist = vector.distance(p, s)
|
local dist = vector.distance(p, s)
|
||||||
|
|
||||||
|
-- dont follow if out of range
|
||||||
if (not self:object_in_range(self.following)) then
|
if (not self:object_in_range(self.following)) then
|
||||||
self.following = nil
|
self.following = nil
|
||||||
else
|
else
|
||||||
|
@ -753,12 +686,17 @@ function mob_class:check_follow()
|
||||||
}
|
}
|
||||||
|
|
||||||
local yaw = (atan(vec.z / vec.x) +math.pi/ 2) - self.rotate
|
local yaw = (atan(vec.z / vec.x) +math.pi/ 2) - self.rotate
|
||||||
|
|
||||||
if p.x > s.x then yaw = yaw +math.pi end
|
if p.x > s.x then yaw = yaw +math.pi end
|
||||||
|
|
||||||
self:set_yaw( yaw, 2.35)
|
self:set_yaw( yaw, 2.35)
|
||||||
|
|
||||||
-- anyone but standing npc's can move along
|
-- anyone but standing npc's can move along
|
||||||
if dist > 3 and self.order ~= "stand" then
|
if dist > 3
|
||||||
|
and self.order ~= "stand" then
|
||||||
|
|
||||||
self:set_velocity(self.follow_velocity)
|
self:set_velocity(self.follow_velocity)
|
||||||
|
|
||||||
if self.walk_chance ~= 0 then
|
if self.walk_chance ~= 0 then
|
||||||
self:set_animation( "run")
|
self:set_animation( "run")
|
||||||
end
|
end
|
||||||
|
@ -766,18 +704,17 @@ function mob_class:check_follow()
|
||||||
self:set_velocity(0)
|
self:set_velocity(0)
|
||||||
self:set_animation( "stand")
|
self:set_animation( "stand")
|
||||||
end
|
end
|
||||||
|
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
function mob_class:flop()
|
|
||||||
-- swimmers flop when out of their element, and swim again when back in
|
-- swimmers flop when out of their element, and swim again when back in
|
||||||
if self.fly then
|
if self.fly then
|
||||||
local s = self.object:get_pos()
|
local s = self.object:get_pos()
|
||||||
|
if self:flight_check( s) == false then
|
||||||
|
|
||||||
if self:flight_check(s) == false then
|
|
||||||
self.state = "flop"
|
self.state = "flop"
|
||||||
self.object:set_acceleration({x = 0, y = DEFAULT_FALL_SPEED, z = 0})
|
self.object:set_acceleration({x = 0, y = DEFAULT_FALL_SPEED, z = 0})
|
||||||
|
|
||||||
|
@ -796,10 +733,11 @@ function mob_class:flop()
|
||||||
end
|
end
|
||||||
|
|
||||||
self:set_animation( "stand", true)
|
self:set_animation( "stand", true)
|
||||||
|
|
||||||
return
|
return
|
||||||
elseif self.state == "flop" then
|
elseif self.state == "flop" then
|
||||||
self.state = "stand"
|
self.state = "stand"
|
||||||
self.object:set_acceleration(vector.zero())
|
self.object:set_acceleration({x = 0, y = 0, z = 0})
|
||||||
self:set_velocity(0)
|
self:set_velocity(0)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -826,12 +764,9 @@ end
|
||||||
local check_herd_timer = 0
|
local check_herd_timer = 0
|
||||||
function mob_class:check_herd(dtime)
|
function mob_class:check_herd(dtime)
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
if not pos or self.state == "attack" then return end
|
if not pos then return end
|
||||||
-- Does any mob not move in group. Weird check for something not set?
|
|
||||||
if self.move_in_group == false then return end
|
|
||||||
|
|
||||||
check_herd_timer = check_herd_timer + dtime
|
check_herd_timer = check_herd_timer + dtime
|
||||||
if check_herd_timer < CHECK_HERD_FREQUENCY then return end
|
if check_herd_timer < 4 then return end
|
||||||
check_herd_timer = 0
|
check_herd_timer = 0
|
||||||
for _,o in pairs(minetest.get_objects_inside_radius(pos,self.view_range)) do
|
for _,o in pairs(minetest.get_objects_inside_radius(pos,self.view_range)) do
|
||||||
local l = o:get_luaentity()
|
local l = o:get_luaentity()
|
||||||
|
@ -962,7 +897,7 @@ function mob_class:do_states_walk()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function mob_class:do_states_stand(player_in_active_range)
|
function mob_class:do_states_stand()
|
||||||
local yaw = self.object:get_yaw() or 0
|
local yaw = self.object:get_yaw() or 0
|
||||||
|
|
||||||
if math.random(1, 4) == 1 then
|
if math.random(1, 4) == 1 then
|
||||||
|
@ -1006,16 +941,14 @@ function mob_class:do_states_stand(player_in_active_range)
|
||||||
if self.order == "stand" or self.order == "sleep" or self.order == "work" then
|
if self.order == "stand" or self.order == "sleep" or self.order == "work" then
|
||||||
|
|
||||||
else
|
else
|
||||||
if player_in_active_range then
|
if self.walk_chance ~= 0
|
||||||
if self.walk_chance ~= 0
|
and self.facing_fence ~= true
|
||||||
and self.facing_fence ~= true
|
and math.random(1, 100) <= self.walk_chance
|
||||||
and math.random(1, 100) <= self.walk_chance
|
and self:is_at_cliff_or_danger() == false then
|
||||||
and self:is_at_cliff_or_danger() == false then
|
|
||||||
|
|
||||||
self:set_velocity(self.walk_velocity)
|
self:set_velocity(self.walk_velocity)
|
||||||
self.state = "walk"
|
self.state = "walk"
|
||||||
self:set_animation( "walk")
|
self:set_animation( "walk")
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,9 +3,6 @@ local mob_class = mcl_mobs.mob_class
|
||||||
|
|
||||||
local PATHFINDING_FAIL_THRESHOLD = 100 -- no. of ticks to fail before giving up. 20p/s. 5s helps them get through door
|
local PATHFINDING_FAIL_THRESHOLD = 100 -- no. of ticks to fail before giving up. 20p/s. 5s helps them get through door
|
||||||
local PATHFINDING_FAIL_WAIT = 30 -- how long to wait before trying to path again
|
local PATHFINDING_FAIL_WAIT = 30 -- how long to wait before trying to path again
|
||||||
local PATHING_START_DELAY = 4 -- When doing non-prioritised pathing, how long to wait until last mob pathed
|
|
||||||
|
|
||||||
local PATHFINDING_SEARCH_DISTANCE = 50 -- How big the square is that pathfinding will look
|
|
||||||
|
|
||||||
local PATHFINDING = "gowp"
|
local PATHFINDING = "gowp"
|
||||||
|
|
||||||
|
@ -110,20 +107,14 @@ local function generate_enriched_path(wp_in, door_open_pos, door_close_pos, cur_
|
||||||
return wp_out
|
return wp_out
|
||||||
end
|
end
|
||||||
|
|
||||||
local last_pathing_time = os.time()
|
function mob_class:ready_to_path()
|
||||||
|
|
||||||
function mob_class:ready_to_path(prioritised)
|
|
||||||
mcl_log("Check ready to path")
|
mcl_log("Check ready to path")
|
||||||
if self._pf_last_failed and (os.time() - self._pf_last_failed) < PATHFINDING_FAIL_WAIT then
|
if self._pf_last_failed and (os.time() - self._pf_last_failed) < PATHFINDING_FAIL_WAIT then
|
||||||
mcl_log("Not ready to path as last fail is less than threshold: " .. (os.time() - self._pf_last_failed))
|
mcl_log("Not ready to path as last fail is less than threshold: " .. (os.time() - self._pf_last_failed))
|
||||||
return false
|
return false
|
||||||
else
|
else
|
||||||
local time_since_path_start = os.time() - last_pathing_time
|
mcl_log("We are ready to pathfind, no previous fail or we are past threshold")
|
||||||
mcl_log("time_since_path_start: " .. tostring(time_since_path_start))
|
return true
|
||||||
if prioritised or (time_since_path_start) > PATHING_START_DELAY then
|
|
||||||
mcl_log("We are ready to pathfind, no previous fail or we are past threshold")
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -153,7 +144,7 @@ local function calculate_path_through_door (p, cur_door_pos, t)
|
||||||
if n.name == "air" then
|
if n.name == "air" then
|
||||||
mcl_log("We have air space next to door at: " .. minetest.pos_to_string(pos_closest_to_door))
|
mcl_log("We have air space next to door at: " .. minetest.pos_to_string(pos_closest_to_door))
|
||||||
|
|
||||||
prospective_wp = minetest.find_path(p, pos_closest_to_door, PATHFINDING_SEARCH_DISTANCE, 1, 4)
|
prospective_wp = minetest.find_path(p,pos_closest_to_door,150,1,4)
|
||||||
|
|
||||||
if prospective_wp then
|
if prospective_wp then
|
||||||
mcl_log("Found a path to next to door".. minetest.pos_to_string(pos_closest_to_door))
|
mcl_log("Found a path to next to door".. minetest.pos_to_string(pos_closest_to_door))
|
||||||
|
@ -163,7 +154,7 @@ local function calculate_path_through_door (p, cur_door_pos, t)
|
||||||
|
|
||||||
if t then
|
if t then
|
||||||
mcl_log("We have t, lets go from door to target")
|
mcl_log("We have t, lets go from door to target")
|
||||||
local wp_otherside_door_to_target = minetest.find_path(other_side_of_door, t, PATHFINDING_SEARCH_DISTANCE, 1, 4)
|
local wp_otherside_door_to_target = minetest.find_path(other_side_of_door,t,150,1,4)
|
||||||
|
|
||||||
if wp_otherside_door_to_target and #wp_otherside_door_to_target > 0 then
|
if wp_otherside_door_to_target and #wp_otherside_door_to_target > 0 then
|
||||||
append_paths (prospective_wp, wp_otherside_door_to_target)
|
append_paths (prospective_wp, wp_otherside_door_to_target)
|
||||||
|
@ -199,13 +190,9 @@ local function calculate_path_through_door (p, cur_door_pos, t)
|
||||||
return enriched_path
|
return enriched_path
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function mob_class:gopath(target,callback_arrived)
|
||||||
|
|
||||||
function mob_class:gopath(target, callback_arrived, prioritised)
|
|
||||||
if self.state == PATHFINDING then mcl_log("Already pathfinding, don't set another until done.") return end
|
if self.state == PATHFINDING then mcl_log("Already pathfinding, don't set another until done.") return end
|
||||||
if not self:ready_to_path(prioritised) then return end
|
if not self:ready_to_path() then return end
|
||||||
|
|
||||||
last_pathing_time = os.time()
|
|
||||||
|
|
||||||
self.order = nil
|
self.order = nil
|
||||||
|
|
||||||
|
@ -213,7 +200,7 @@ function mob_class:gopath(target, callback_arrived, prioritised)
|
||||||
local t = vector.offset(target,0,1,0)
|
local t = vector.offset(target,0,1,0)
|
||||||
|
|
||||||
--Check direct route
|
--Check direct route
|
||||||
local wp = minetest.find_path(p, t, PATHFINDING_SEARCH_DISTANCE, 1, 4)
|
local wp = minetest.find_path(p,t,150,1,4)
|
||||||
|
|
||||||
if not wp then
|
if not wp then
|
||||||
mcl_log("### No direct path. Path through door closest to target.")
|
mcl_log("### No direct path. Path through door closest to target.")
|
||||||
|
@ -423,7 +410,7 @@ function mob_class:check_gowp(dtime)
|
||||||
mcl_log("No current target")
|
mcl_log("No current target")
|
||||||
end
|
end
|
||||||
|
|
||||||
local final_wp = minetest.find_path(p, self._target, PATHFINDING_SEARCH_DISTANCE, 1, 4)
|
local final_wp = minetest.find_path(p,self._target,150,1,4)
|
||||||
if final_wp then
|
if final_wp then
|
||||||
mcl_log("We can get to target here.")
|
mcl_log("We can get to target here.")
|
||||||
-- self.waypoints = final_wp
|
-- self.waypoints = final_wp
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
||||||
local mob_class = mcl_mobs.mob_class
|
local mob_class = mcl_mobs.mob_class
|
||||||
local validate_vector = mcl_util.validate_vector
|
|
||||||
|
|
||||||
local ENTITY_CRAMMING_MAX = 24
|
local ENTITY_CRAMMING_MAX = 24
|
||||||
local CRAMMING_DAMAGE = 3
|
local CRAMMING_DAMAGE = 3
|
||||||
|
@ -185,7 +184,7 @@ function mob_class:collision()
|
||||||
end
|
end
|
||||||
|
|
||||||
function mob_class:check_death_and_slow_mob()
|
function mob_class:check_death_and_slow_mob()
|
||||||
local d = 0.7
|
local d = 0.85
|
||||||
local dying = self:check_dying()
|
local dying = self:check_dying()
|
||||||
if dying then d = 0.92 end
|
if dying then d = 0.92 end
|
||||||
|
|
||||||
|
@ -199,8 +198,6 @@ end
|
||||||
|
|
||||||
-- move mob in facing direction
|
-- move mob in facing direction
|
||||||
function mob_class:set_velocity(v)
|
function mob_class:set_velocity(v)
|
||||||
if not v then return end
|
|
||||||
|
|
||||||
local c_x, c_y = 0, 0
|
local c_x, c_y = 0, 0
|
||||||
|
|
||||||
-- can mob be pushed, if so calculate direction
|
-- can mob be pushed, if so calculate direction
|
||||||
|
@ -210,15 +207,18 @@ function mob_class:set_velocity(v)
|
||||||
|
|
||||||
-- halt mob if it has been ordered to stay
|
-- halt mob if it has been ordered to stay
|
||||||
if self.order == "stand" or self.order == "sit" then
|
if self.order == "stand" or self.order == "sit" then
|
||||||
self.acc = vector.zero()
|
self.acc=vector.new(0,0,0)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local yaw = (self.object:get_yaw() or 0) + self.rotate
|
local yaw = (self.object:get_yaw() or 0) + self.rotate
|
||||||
local vv = self.object:get_velocity()
|
local vv = self.object:get_velocity()
|
||||||
|
if vv then
|
||||||
if vv and yaw then
|
self.acc={
|
||||||
self.acc = vector.new(((math.sin(yaw) * -v) + c_x) * .4, 0, ((math.cos(yaw) * v) + c_y) * .4)
|
x = ((math.sin(yaw) * -v) + c_x)*.27,
|
||||||
|
y = 0,
|
||||||
|
z = ((math.cos(yaw) * v) + c_y)*.27,
|
||||||
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -311,8 +311,6 @@ end
|
||||||
function mob_class:set_yaw(yaw, delay, dtime)
|
function mob_class:set_yaw(yaw, delay, dtime)
|
||||||
if self.noyaw then return end
|
if self.noyaw then return end
|
||||||
|
|
||||||
if not self.object:get_yaw() or not self.object:get_pos() then return end
|
|
||||||
|
|
||||||
if self.state ~= PATHFINDING then
|
if self.state ~= PATHFINDING then
|
||||||
self._turn_to = yaw
|
self._turn_to = yaw
|
||||||
end
|
end
|
||||||
|
@ -328,9 +326,9 @@ function mob_class:set_yaw(yaw, delay, dtime)
|
||||||
end
|
end
|
||||||
|
|
||||||
if math.deg(yaw) > 360 then
|
if math.deg(yaw) > 360 then
|
||||||
yaw=math.rad(math.deg(yaw)%360)
|
yaw=yaw%360
|
||||||
elseif math.deg(yaw) < 0 then
|
elseif math.deg(yaw) < 0 then
|
||||||
yaw=math.rad(((360*5)-math.deg(yaw))%360)
|
yaw=((360*5)-yaw)%360
|
||||||
end
|
end
|
||||||
|
|
||||||
--calculate the shortest way to turn to find our target
|
--calculate the shortest way to turn to find our target
|
||||||
|
@ -354,9 +352,9 @@ function mob_class:set_yaw(yaw, delay, dtime)
|
||||||
ddtime = dtime
|
ddtime = dtime
|
||||||
end
|
end
|
||||||
|
|
||||||
if math.abs(target_shortest_path_nums) > 10 then
|
if math.abs(target_shortest_path_nums) > 5 then
|
||||||
self.object:set_yaw(self.object:get_yaw()+(target_shortest_path*(3.6*ddtime)))
|
self.object:set_yaw(self.object:get_yaw()+(target_shortest_path*(3.6*ddtime)))
|
||||||
if validate_vector(self.acc) then
|
if self.acc then
|
||||||
self.acc=vector.rotate_around_axis(self.acc,vector.new(0,1,0), target_shortest_path*(3.6*ddtime))
|
self.acc=vector.rotate_around_axis(self.acc,vector.new(0,1,0), target_shortest_path*(3.6*ddtime))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -464,14 +462,6 @@ function mob_class:check_for_death(cause, cmi_cause)
|
||||||
self:mob_sound("death")
|
self:mob_sound("death")
|
||||||
|
|
||||||
local function death_handle(self)
|
local function death_handle(self)
|
||||||
if cmi_cause and cmi_cause["type"] then
|
|
||||||
--minetest.log("cmi_cause: " .. tostring(cmi_cause["type"]))
|
|
||||||
end
|
|
||||||
--minetest.log("cause: " .. tostring(cause))
|
|
||||||
|
|
||||||
-- TODO other env damage shouldn't drop xp
|
|
||||||
-- "rain", "water", "drowning", "suffocation"
|
|
||||||
|
|
||||||
-- dropped cooked item if mob died in fire or lava
|
-- dropped cooked item if mob died in fire or lava
|
||||||
if cause == "lava" or cause == "fire" then
|
if cause == "lava" or cause == "fire" then
|
||||||
self:item_drop(true, 0)
|
self:item_drop(true, 0)
|
||||||
|
@ -488,21 +478,9 @@ function mob_class:check_for_death(cause, cmi_cause)
|
||||||
self:item_drop(cooked, looting)
|
self:item_drop(cooked, looting)
|
||||||
|
|
||||||
if ((not self.child) or self.type ~= "animal") and (minetest.get_us_time() - self.xp_timestamp <= math.huge) then
|
if ((not self.child) or self.type ~= "animal") and (minetest.get_us_time() - self.xp_timestamp <= math.huge) then
|
||||||
local pos = self.object:get_pos()
|
mcl_experience.throw_xp(self.object:get_pos(), math.random(self.xp_min, self.xp_max))
|
||||||
local xp_amount = math.random(self.xp_min, self.xp_max)
|
|
||||||
|
|
||||||
if not mcl_sculk.handle_death(pos, xp_amount) then
|
|
||||||
--minetest.log("Xp not thrown")
|
|
||||||
if minetest.is_creative_enabled("") ~= true then
|
|
||||||
mcl_experience.throw_xp(pos, xp_amount)
|
|
||||||
end
|
|
||||||
else
|
|
||||||
--minetest.log("xp thrown")
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- execute custom death function
|
-- execute custom death function
|
||||||
|
@ -522,12 +500,6 @@ function mob_class:check_for_death(cause, cmi_cause)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.jockey or self.riden_by_jock then
|
|
||||||
self.riden_by_jock = nil
|
|
||||||
self.jockey = nil
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
local collisionbox
|
local collisionbox
|
||||||
if self.collisionbox then
|
if self.collisionbox then
|
||||||
collisionbox = table.copy(self.collisionbox)
|
collisionbox = table.copy(self.collisionbox)
|
||||||
|
@ -634,34 +606,24 @@ function mob_class:do_env_damage()
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
local node = minetest.get_node(pos)
|
local sunlight = minetest.get_natural_light(pos, self.time_of_day)
|
||||||
if node then
|
|
||||||
if node.name ~= "ignore" then
|
-- bright light harms mob
|
||||||
-- put below code in this block if we can prove that unloaded maps are causing crash.
|
if self.light_damage ~= 0 and (sunlight or 0) > 12 then
|
||||||
-- it should warn then error
|
if self:deal_light_damage(pos, self.light_damage) then
|
||||||
else
|
return true
|
||||||
--minetest.log("warning", "Pos is ignored: " .. dump(pos))
|
|
||||||
end
|
end
|
||||||
|
end
|
||||||
local sunlight = mcl_util.get_natural_light(pos, self.time_of_day)
|
local _, dim = mcl_worlds.y_to_layer(pos.y)
|
||||||
|
if (self.sunlight_damage ~= 0 or self.ignited_by_sunlight) and (sunlight or 0) >= minetest.LIGHT_MAX and dim == "overworld" then
|
||||||
if self.light_damage ~= 0 and (sunlight or 0) > 12 then
|
if self.armor_list and not self.armor_list.helmet or not self.armor_list or self.armor_list and self.armor_list.helmet and self.armor_list.helmet == "" then
|
||||||
if self:deal_light_damage(pos, self.light_damage) then
|
if self.ignited_by_sunlight then
|
||||||
|
mcl_burning.set_on_fire(self.object, 10)
|
||||||
|
else
|
||||||
|
self:deal_light_damage(pos, self.sunlight_damage)
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
local _, dim = mcl_worlds.y_to_layer(pos.y)
|
|
||||||
if (self.sunlight_damage ~= 0 or self.ignited_by_sunlight) and (sunlight or 0) >= minetest.LIGHT_MAX and dim == "overworld" then
|
|
||||||
if self.armor_list and not self.armor_list.helmet or not self.armor_list or self.armor_list and self.armor_list.helmet and self.armor_list.helmet == "" then
|
|
||||||
if self.ignited_by_sunlight then
|
|
||||||
mcl_burning.set_on_fire(self.object, 10)
|
|
||||||
else
|
|
||||||
self:deal_light_damage(pos, self.sunlight_damage)
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local y_level = self.collisionbox[2]
|
local y_level = self.collisionbox[2]
|
||||||
|
@ -676,24 +638,18 @@ function mob_class:do_env_damage()
|
||||||
self.standing_in = node_ok(pos, "air").name
|
self.standing_in = node_ok(pos, "air").name
|
||||||
self.standing_on = node_ok(pos2, "air").name
|
self.standing_on = node_ok(pos2, "air").name
|
||||||
|
|
||||||
local pos3 = vector.offset(pos, 0, 1, 0)
|
|
||||||
self.standing_under = node_ok(pos3, "air").name
|
|
||||||
|
|
||||||
-- don't fall when on ignore, just stand still
|
-- don't fall when on ignore, just stand still
|
||||||
if self.standing_in == "ignore" then
|
if self.standing_in == "ignore" then
|
||||||
self.object:set_velocity({x = 0, y = 0, z = 0})
|
self.object:set_velocity({x = 0, y = 0, z = 0})
|
||||||
-- wither rose effect
|
|
||||||
elseif self.standing_in == "mcl_flowers:wither_rose" then
|
|
||||||
mcl_potions.withering_func(self.object, 1, 2)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local nodef = minetest.registered_nodes[self.standing_in]
|
local nodef = minetest.registered_nodes[self.standing_in]
|
||||||
local nodef2 = minetest.registered_nodes[self.standing_on]
|
local nodef2 = minetest.registered_nodes[self.standing_on]
|
||||||
local nodef3 = minetest.registered_nodes[self.standing_under]
|
|
||||||
|
|
||||||
-- rain
|
-- rain
|
||||||
if self.rain_damage > 0 then
|
if self.rain_damage > 0 then
|
||||||
if mcl_weather.rain.raining and mcl_weather.is_outdoor(pos) then
|
if mcl_weather.rain.raining and mcl_weather.is_outdoor(pos) then
|
||||||
|
|
||||||
self.health = self.health - self.rain_damage
|
self.health = self.health - self.rain_damage
|
||||||
|
|
||||||
if self:check_for_death("rain", {type = "environment",
|
if self:check_for_death("rain", {type = "environment",
|
||||||
|
@ -706,9 +662,13 @@ function mob_class:do_env_damage()
|
||||||
pos.y = pos.y + 1 -- for particle effect position
|
pos.y = pos.y + 1 -- for particle effect position
|
||||||
|
|
||||||
-- water damage
|
-- water damage
|
||||||
if self.water_damage > 0 and nodef.groups.water then
|
if self.water_damage > 0
|
||||||
|
and nodef.groups.water then
|
||||||
|
|
||||||
if self.water_damage ~= 0 then
|
if self.water_damage ~= 0 then
|
||||||
|
|
||||||
self.health = self.health - self.water_damage
|
self.health = self.health - self.water_damage
|
||||||
|
|
||||||
mcl_mobs.effect(pos, 5, "mcl_particles_smoke.png", nil, nil, 1, nil)
|
mcl_mobs.effect(pos, 5, "mcl_particles_smoke.png", nil, nil, 1, nil)
|
||||||
|
|
||||||
if self:check_for_death("water", {type = "environment",
|
if self:check_for_death("water", {type = "environment",
|
||||||
|
@ -716,10 +676,27 @@ function mob_class:do_env_damage()
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
elseif self.lava_damage > 0 and (nodef.groups.lava) then
|
-- magma damage
|
||||||
-- lava damage
|
elseif self.fire_damage > 0
|
||||||
|
and (nodef2.groups.fire) then
|
||||||
|
|
||||||
|
if self.fire_damage ~= 0 then
|
||||||
|
|
||||||
|
self.health = self.health - self.fire_damage
|
||||||
|
|
||||||
|
if self:check_for_death("fire", {type = "environment",
|
||||||
|
pos = pos, node = self.standing_in}) then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
-- lava damage
|
||||||
|
elseif self.lava_damage > 0
|
||||||
|
and (nodef.groups.lava) then
|
||||||
|
|
||||||
if self.lava_damage ~= 0 then
|
if self.lava_damage ~= 0 then
|
||||||
|
|
||||||
self.health = self.health - self.lava_damage
|
self.health = self.health - self.lava_damage
|
||||||
|
|
||||||
mcl_mobs.effect(pos, 5, "fire_basic_flame.png", nil, nil, 1, nil)
|
mcl_mobs.effect(pos, 5, "fire_basic_flame.png", nil, nil, 1, nil)
|
||||||
mcl_burning.set_on_fire(self.object, 10)
|
mcl_burning.set_on_fire(self.object, 10)
|
||||||
|
|
||||||
|
@ -728,20 +705,15 @@ function mob_class:do_env_damage()
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
elseif self.fire_damage > 0 and (nodef2.groups.fire) then
|
|
||||||
-- magma damage
|
-- fire damage
|
||||||
|
elseif self.fire_damage > 0
|
||||||
|
and (nodef.groups.fire) then
|
||||||
|
|
||||||
if self.fire_damage ~= 0 then
|
if self.fire_damage ~= 0 then
|
||||||
|
|
||||||
self.health = self.health - self.fire_damage
|
self.health = self.health - self.fire_damage
|
||||||
|
|
||||||
if self:check_for_death("fire", {type = "environment",
|
|
||||||
pos = pos, node = self.standing_in}) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
elseif self.fire_damage > 0 and (nodef.groups.fire) then
|
|
||||||
-- fire damage
|
|
||||||
if self.fire_damage ~= 0 then
|
|
||||||
self.health = self.health - self.fire_damage
|
|
||||||
mcl_mobs.effect(pos, 5, "fire_basic_flame.png", nil, nil, 1, nil)
|
mcl_mobs.effect(pos, 5, "fire_basic_flame.png", nil, nil, 1, nil)
|
||||||
mcl_burning.set_on_fire(self.object, 5)
|
mcl_burning.set_on_fire(self.object, 5)
|
||||||
|
|
||||||
|
@ -750,9 +722,12 @@ function mob_class:do_env_damage()
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- damage_per_second node check
|
||||||
elseif nodef.damage_per_second ~= 0 and not nodef.groups.lava and not nodef.groups.fire then
|
elseif nodef.damage_per_second ~= 0 and not nodef.groups.lava and not nodef.groups.fire then
|
||||||
-- damage_per_second node check
|
|
||||||
self.health = self.health - nodef.damage_per_second
|
self.health = self.health - nodef.damage_per_second
|
||||||
|
|
||||||
mcl_mobs.effect(pos, 5, "mcl_particles_smoke.png")
|
mcl_mobs.effect(pos, 5, "mcl_particles_smoke.png")
|
||||||
|
|
||||||
if self:check_for_death("dps", {type = "environment",
|
if self:check_for_death("dps", {type = "environment",
|
||||||
|
@ -764,17 +739,17 @@ function mob_class:do_env_damage()
|
||||||
-- Drowning damage
|
-- Drowning damage
|
||||||
if self.breath_max ~= -1 then
|
if self.breath_max ~= -1 then
|
||||||
local drowning = false
|
local drowning = false
|
||||||
|
|
||||||
if self.breathes_in_water then
|
if self.breathes_in_water then
|
||||||
if minetest.get_item_group(self.standing_in, "water") == 0 then
|
if minetest.get_item_group(self.standing_in, "water") == 0 then
|
||||||
drowning = true
|
drowning = true
|
||||||
end
|
end
|
||||||
elseif nodef.drowning > 0 and nodef3.drowning > 0 then
|
elseif nodef.drowning > 0 then
|
||||||
drowning = true
|
drowning = true
|
||||||
end
|
end
|
||||||
|
|
||||||
if drowning then
|
if drowning then
|
||||||
|
|
||||||
self.breath = math.max(0, self.breath - 1)
|
self.breath = math.max(0, self.breath - 1)
|
||||||
|
|
||||||
mcl_mobs.effect(pos, 2, "bubble.png", nil, nil, 1, nil)
|
mcl_mobs.effect(pos, 2, "bubble.png", nil, nil, 1, nil)
|
||||||
if self.breath <= 0 then
|
if self.breath <= 0 then
|
||||||
local dmg
|
local dmg
|
||||||
|
@ -825,33 +800,25 @@ function mob_class:do_env_damage()
|
||||||
self.suffocation_timer = 0
|
self.suffocation_timer = 0
|
||||||
end
|
end
|
||||||
|
|
||||||
return self:check_for_death("unknown", {type = "unknown"})
|
return self:check_for_death("", {type = "unknown"})
|
||||||
end
|
end
|
||||||
|
|
||||||
function mob_class:step_damage (dtime, pos)
|
function mob_class:env_damage (dtime, pos)
|
||||||
if not self.fire_resistant then
|
|
||||||
mcl_burning.tick(self.object, dtime, self)
|
|
||||||
if not self.object:get_pos() then return true end -- mcl_burning.tick may remove object immediately
|
|
||||||
|
|
||||||
if self:check_for_death("fire", {type = "fire"}) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- environmental damage timer (every 1 second)
|
-- environmental damage timer (every 1 second)
|
||||||
self.env_damage_timer = self.env_damage_timer + dtime
|
self.env_damage_timer = self.env_damage_timer + dtime
|
||||||
|
|
||||||
if self.env_damage_timer > 1 then
|
if (self.state == "attack" and self.env_damage_timer > 1)
|
||||||
self.env_damage_timer = 0
|
or self.state ~= "attack" then
|
||||||
|
|
||||||
self:check_entity_cramming()
|
self:check_entity_cramming()
|
||||||
|
self.env_damage_timer = 0
|
||||||
|
|
||||||
-- check for environmental damage (water, fire, lava etc.)
|
-- check for environmental damage (water, fire, lava etc.)
|
||||||
if self:do_env_damage() then
|
if self:do_env_damage() then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
self:replace_node(pos) -- (sheep eats grass etc.)
|
-- node replace check (cow eats grass etc.)
|
||||||
|
self:replace(pos)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -919,36 +886,47 @@ function mob_class:falling(pos)
|
||||||
-- floating in water (or falling)
|
-- floating in water (or falling)
|
||||||
local v = self.object:get_velocity()
|
local v = self.object:get_velocity()
|
||||||
if v then
|
if v then
|
||||||
local new_acceleration
|
|
||||||
|
|
||||||
if v.y > 0 then
|
if v.y > 0 then
|
||||||
-- apply gravity when moving up
|
-- apply gravity when moving up
|
||||||
new_acceleration = vector.new(0, DEFAULT_FALL_SPEED, 0)
|
self.object:set_acceleration({
|
||||||
|
x = 0,
|
||||||
|
y = DEFAULT_FALL_SPEED,
|
||||||
|
z = 0
|
||||||
|
})
|
||||||
|
|
||||||
elseif v.y <= 0 and v.y > self.fall_speed then
|
elseif v.y <= 0 and v.y > self.fall_speed then
|
||||||
-- fall downwards at set speed
|
-- fall downwards at set speed
|
||||||
new_acceleration = vector.new(0, self.fall_speed, 0)
|
self.object:set_acceleration({
|
||||||
|
x = 0,
|
||||||
|
y = self.fall_speed,
|
||||||
|
z = 0
|
||||||
|
})
|
||||||
else
|
else
|
||||||
-- stop accelerating once max fall speed hit
|
-- stop accelerating once max fall speed hit
|
||||||
new_acceleration =vector.zero()
|
self.object:set_acceleration({x = 0, y = 0, z = 0})
|
||||||
end
|
end
|
||||||
|
|
||||||
self.object:set_acceleration(new_acceleration)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local acc = self.object:get_acceleration()
|
local acc = self.object:get_acceleration()
|
||||||
|
|
||||||
local registered_node = minetest.registered_nodes[node_ok(pos).name]
|
if minetest.registered_nodes[node_ok(pos).name].groups.lava then
|
||||||
|
|
||||||
if registered_node.groups.lava then
|
|
||||||
if acc and self.floats_on_lava == 1 then
|
if acc and self.floats_on_lava == 1 then
|
||||||
self.object:set_acceleration(vector.new(0, -self.fall_speed / (math.max(1, v.y) ^ 2), 0))
|
self.object:set_acceleration({
|
||||||
|
x = 0,
|
||||||
|
y = -self.fall_speed / (math.max(1, v.y) ^ 2),
|
||||||
|
z = 0
|
||||||
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- in water then float up
|
-- in water then float up
|
||||||
if registered_node.groups.water then
|
if minetest.registered_nodes[node_ok(pos).name].groups.water then
|
||||||
if acc and self.floats == 1 and minetest.registered_nodes[node_ok(vector.offset(pos,0,self.collisionbox[5] -0.25,0)).name].groups.water then
|
if acc and self.floats == 1 then
|
||||||
self.object:set_acceleration(vector.new(0, -self.fall_speed / (math.max(1, v.y) ^ 2), 0))
|
self.object:set_acceleration({
|
||||||
|
x = 0,
|
||||||
|
y = -self.fall_speed / (math.max(1, v.y) ^ 2),
|
||||||
|
z = 0
|
||||||
|
})
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
-- fall damage onto solid ground
|
-- fall damage onto solid ground
|
||||||
|
@ -1021,10 +999,10 @@ function mob_class:check_dying()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function mob_class:check_suspend(player_in_active_range)
|
function mob_class:check_suspend()
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
|
|
||||||
if pos and not player_in_active_range then
|
if pos and not self:player_in_active_range() then
|
||||||
local node_under = node_ok(vector.offset(pos,0,-1,0)).name
|
local node_under = node_ok(vector.offset(pos,0,-1,0)).name
|
||||||
|
|
||||||
self:set_animation( "stand", true)
|
self:set_animation( "stand", true)
|
||||||
|
@ -1032,8 +1010,11 @@ function mob_class:check_suspend(player_in_active_range)
|
||||||
local acc = self.object:get_acceleration()
|
local acc = self.object:get_acceleration()
|
||||||
if acc then
|
if acc then
|
||||||
if acc.y > 0 or node_under ~= "air" then
|
if acc.y > 0 or node_under ~= "air" then
|
||||||
self.object:set_acceleration(vector.zero())
|
self.object:set_acceleration(vector.new(0,0,0))
|
||||||
self.object:set_velocity(vector.zero())
|
self.object:set_velocity(vector.new(0,0,0))
|
||||||
|
end
|
||||||
|
if acc.y == 0 and node_under == "air" then
|
||||||
|
self:falling(pos)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return true
|
return true
|
||||||
|
|
|
@ -2,13 +2,6 @@
|
||||||
local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
|
||||||
local mob_class = mcl_mobs.mob_class
|
local mob_class = mcl_mobs.mob_class
|
||||||
|
|
||||||
local modern_lighting = minetest.settings:get_bool("mcl_mobs_modern_lighting", true)
|
|
||||||
local nether_threshold = tonumber(minetest.settings:get("mcl_mobs_nether_threshold")) or 11
|
|
||||||
local end_threshold = tonumber(minetest.settings:get("mcl_mobs_end_threshold")) or 0
|
|
||||||
local overworld_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_threshold")) or 0
|
|
||||||
local overworld_sky_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_sky_threshold")) or 7
|
|
||||||
local overworld_passive_threshold = tonumber(minetest.settings:get("mcl_mobs_overworld_passive_threshold")) or 7
|
|
||||||
|
|
||||||
local get_node = minetest.get_node
|
local get_node = minetest.get_node
|
||||||
local get_item_group = minetest.get_item_group
|
local get_item_group = minetest.get_item_group
|
||||||
local get_node_light = minetest.get_node_light
|
local get_node_light = minetest.get_node_light
|
||||||
|
@ -31,67 +24,25 @@ local vector_floor = vector.floor
|
||||||
|
|
||||||
local table_copy = table.copy
|
local table_copy = table.copy
|
||||||
local table_remove = table.remove
|
local table_remove = table.remove
|
||||||
|
|
||||||
local pairs = pairs
|
local pairs = pairs
|
||||||
|
|
||||||
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_mobs_spawning", false)
|
|
||||||
local function mcl_log (message, property)
|
|
||||||
if LOGGING_ON then
|
|
||||||
if property then
|
|
||||||
message = message .. ": " .. dump(property)
|
|
||||||
end
|
|
||||||
mcl_util.mcl_log (message, "[Mobs spawn]", true)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local dbg_spawn_attempts = 0
|
local dbg_spawn_attempts = 0
|
||||||
local dbg_spawn_succ = 0
|
local dbg_spawn_succ = 0
|
||||||
local dbg_spawn_counts = {}
|
local dbg_spawn_counts = {}
|
||||||
|
-- range for mob count
|
||||||
|
local aoc_range = 136
|
||||||
local remove_far = true
|
local remove_far = true
|
||||||
|
|
||||||
local WAIT_FOR_SPAWN_ATTEMPT = 10
|
|
||||||
local FIND_SPAWN_POS_RETRIES = 16
|
|
||||||
local FIND_SPAWN_POS_RETRIES_SUCCESS_RESPIN = 8
|
|
||||||
|
|
||||||
local MOB_SPAWN_ZONE_INNER = 24
|
|
||||||
local MOB_SPAWN_ZONE_MIDDLE = 32
|
|
||||||
local MOB_SPAWN_ZONE_OUTER = 128
|
|
||||||
|
|
||||||
-- range for mob count
|
|
||||||
local MOB_CAP_INNER_RADIUS = 32
|
|
||||||
local aoc_range = 136
|
|
||||||
|
|
||||||
local MISSING_CAP_DEFAULT = 15
|
|
||||||
local MOBS_CAP_CLOSE = 10
|
|
||||||
|
|
||||||
local SPAWN_MAPGEN_LIMIT = mcl_vars.mapgen_limit - 150
|
|
||||||
|
|
||||||
local mob_cap = {
|
local mob_cap = {
|
||||||
hostile = tonumber(minetest.settings:get("mcl_mob_cap_monster")) or 70,
|
monster = tonumber(minetest.settings:get("mcl_mob_cap_monster")) or 70,
|
||||||
passive = tonumber(minetest.settings:get("mcl_mob_cap_animal")) or 10,
|
animal = tonumber(minetest.settings:get("mcl_mob_cap_animal")) or 10,
|
||||||
ambient = tonumber(minetest.settings:get("mcl_mob_cap_ambient")) or 15,
|
ambient = tonumber(minetest.settings:get("mcl_mob_cap_ambient")) or 15,
|
||||||
water = tonumber(minetest.settings:get("mcl_mob_cap_water")) or 8,
|
water = tonumber(minetest.settings:get("mcl_mob_cap_water")) or 5, --currently unused
|
||||||
water_ambient = tonumber(minetest.settings:get("mcl_mob_cap_water_ambient")) or 20,
|
water_ambient = tonumber(minetest.settings:get("mcl_mob_cap_water_ambient")) or 20, --currently unused
|
||||||
water_underground = tonumber(minetest.settings:get("mcl_mob_cap_water_underground")) or 5,
|
|
||||||
axolotl = tonumber(minetest.settings:get("mcl_mob_cap_axolotl")) or 2, -- TODO should be 5 when lush caves added
|
|
||||||
player = tonumber(minetest.settings:get("mcl_mob_cap_player")) or 75,
|
player = tonumber(minetest.settings:get("mcl_mob_cap_player")) or 75,
|
||||||
global_hostile = tonumber(minetest.settings:get("mcl_mob_cap_hostile")) or 300,
|
|
||||||
global_non_hostile = tonumber(minetest.settings:get("mcl_mob_cap_non_hostile")) or 300,
|
|
||||||
total = tonumber(minetest.settings:get("mcl_mob_cap_total")) or 500,
|
total = tonumber(minetest.settings:get("mcl_mob_cap_total")) or 500,
|
||||||
}
|
}
|
||||||
|
|
||||||
local peaceful_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_peaceful_percentage_spawned")) or 30
|
|
||||||
local peaceful_group_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_peaceful_group_percentage_spawned")) or 15
|
|
||||||
local hostile_group_percentage_spawned = tonumber(minetest.settings:get("mcl_mob_hostile_group_percentage_spawned")) or 20
|
|
||||||
|
|
||||||
mcl_log("Mob cap hostile: " .. mob_cap.hostile)
|
|
||||||
mcl_log("Mob cap water: " .. mob_cap.water)
|
|
||||||
mcl_log("Mob cap passive: " .. mob_cap.passive)
|
|
||||||
|
|
||||||
mcl_log("Percentage of peacefuls spawned: " .. peaceful_percentage_spawned)
|
|
||||||
mcl_log("Percentage of peaceful spawns are group: " .. peaceful_group_percentage_spawned)
|
|
||||||
mcl_log("Percentage of hostile spawns are group: " .. hostile_group_percentage_spawned)
|
|
||||||
|
|
||||||
--do mobs spawn?
|
--do mobs spawn?
|
||||||
local mobs_spawn = minetest.settings:get_bool("mobs_spawn", true) ~= false
|
local mobs_spawn = minetest.settings:get_bool("mobs_spawn", true) ~= false
|
||||||
local spawn_protected = minetest.settings:get_bool("mobs_spawn_protected") ~= false
|
local spawn_protected = minetest.settings:get_bool("mobs_spawn_protected") ~= false
|
||||||
|
@ -299,115 +250,36 @@ local function count_mobs_total(mob_type)
|
||||||
return num
|
return num
|
||||||
end
|
end
|
||||||
|
|
||||||
local function count_mobs_add_entry (mobs_list, mob_cat)
|
local function count_mobs_all()
|
||||||
if mobs_list[mob_cat] then
|
local mobs_found = {}
|
||||||
mobs_list[mob_cat] = mobs_list[mob_cat] + 1
|
|
||||||
else
|
|
||||||
mobs_list[mob_cat] = 1
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
--categorise_by can be name or type or spawn_class
|
|
||||||
local function count_mobs_all(categorise_by, pos)
|
|
||||||
local mobs_found_wide = {}
|
|
||||||
local mobs_found_close = {}
|
|
||||||
|
|
||||||
local num = 0
|
local num = 0
|
||||||
for _,entity in pairs(minetest.luaentities) do
|
for _,entity in pairs(minetest.luaentities) do
|
||||||
if entity and entity.is_mob then
|
if entity.is_mob then
|
||||||
|
local mob_type = entity.type -- animal / monster / npc
|
||||||
local add_entry = false
|
local mob_name = entity.name
|
||||||
--local mob_type = entity.type -- animal / monster / npc
|
if mobs_found[mob_name] then
|
||||||
local mob_cat = entity[categorise_by]
|
mobs_found[mob_name] = mobs_found[mob_name] + 1
|
||||||
|
|
||||||
if pos then
|
|
||||||
local mob_pos = entity.object:get_pos()
|
|
||||||
if mob_pos then
|
|
||||||
local distance = vector.distance(pos, mob_pos)
|
|
||||||
--mcl_log("distance: ".. distance)
|
|
||||||
if distance <= MOB_SPAWN_ZONE_MIDDLE then
|
|
||||||
--mcl_log("distance is close")
|
|
||||||
count_mobs_add_entry (mobs_found_close, mob_cat)
|
|
||||||
count_mobs_add_entry (mobs_found_wide, mob_cat)
|
|
||||||
add_entry = true
|
|
||||||
elseif distance <= MOB_SPAWN_ZONE_OUTER then
|
|
||||||
--mcl_log("distance is wide")
|
|
||||||
count_mobs_add_entry (mobs_found_wide, mob_cat)
|
|
||||||
add_entry = true
|
|
||||||
else
|
|
||||||
--mcl_log("mob_pos: " .. minetest.pos_to_string(mob_pos))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
count_mobs_add_entry (mobs_found_wide, mob_cat)
|
mobs_found[mob_name] = 1
|
||||||
add_entry = true
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
if add_entry then
|
|
||||||
num = num + 1
|
|
||||||
end
|
end
|
||||||
|
num = num + 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--mcl_log("num: ".. num)
|
return mobs_found, num
|
||||||
return mobs_found_close, mobs_found_wide, num
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local function count_mobs_total_cap(mob_type)
|
local function count_mobs_total_cap(mob_type)
|
||||||
local total = 0
|
|
||||||
local num = 0
|
local num = 0
|
||||||
local hostile = 0
|
|
||||||
local non_hostile = 0
|
|
||||||
for _,l in pairs(minetest.luaentities) do
|
for _,l in pairs(minetest.luaentities) do
|
||||||
if l.is_mob then
|
if l.is_mob then
|
||||||
total = total + 1
|
if ( mob_type == nil or l.type == mob_type ) and l.can_despawn and not l.nametag then
|
||||||
local nametagged = l.nametag and l.nametag ~= ""
|
|
||||||
if ( mob_type == nil or l.type == mob_type ) and not nametagged then
|
|
||||||
if l.spawn_class == "hostile" then
|
|
||||||
hostile = hostile + 1
|
|
||||||
else
|
|
||||||
non_hostile = non_hostile + 1
|
|
||||||
end
|
|
||||||
num = num + 1
|
num = num + 1
|
||||||
else
|
|
||||||
mcl_log("l.name", l.name)
|
|
||||||
mcl_log("l.nametag", l.nametag)
|
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
mcl_log("Total mobs", total)
|
return num
|
||||||
mcl_log("hostile", hostile)
|
|
||||||
mcl_log("non_hostile", non_hostile)
|
|
||||||
return num, non_hostile, hostile
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local function output_mob_stats(mob_counts, total_mobs, chat_display)
|
|
||||||
if (total_mobs) then
|
|
||||||
local total_output = "Total mobs found: " .. total_mobs
|
|
||||||
if chat_display then
|
|
||||||
minetest.log(total_output)
|
|
||||||
else
|
|
||||||
minetest.log("action", total_output)
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
local detailed = ""
|
|
||||||
if mob_counts then
|
|
||||||
for k, v1 in pairs(mob_counts) do
|
|
||||||
detailed = detailed .. tostring(k) .. ": " .. tostring(v1) .. "; "
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if detailed and detailed ~= "" then
|
|
||||||
if chat_display then
|
|
||||||
minetest.log(detailed)
|
|
||||||
else
|
|
||||||
minetest.log("action", detailed)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
-- global functions
|
-- global functions
|
||||||
|
|
||||||
function mcl_mobs:spawn_abm_check(pos, node, name)
|
function mcl_mobs:spawn_abm_check(pos, node, name)
|
||||||
|
@ -444,8 +316,6 @@ WARNING: BIOME INTEGRATION NEEDED -> How to get biome through lua??
|
||||||
|
|
||||||
--this is where all of the spawning information is kept
|
--this is where all of the spawning information is kept
|
||||||
local spawn_dictionary = {}
|
local spawn_dictionary = {}
|
||||||
--this is where all of the spawning information is kept for mobs that don't naturally spawn
|
|
||||||
local non_spawn_dictionary = {}
|
|
||||||
local summary_chance = 0
|
local summary_chance = 0
|
||||||
|
|
||||||
function mcl_mobs:spawn_setup(def)
|
function mcl_mobs:spawn_setup(def)
|
||||||
|
@ -511,69 +381,7 @@ function mcl_mobs:spawn_setup(def)
|
||||||
summary_chance = summary_chance + chance
|
summary_chance = summary_chance + chance
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_mobs:mob_light_lvl(mob_name, dimension)
|
function mcl_mobs:spawn_specific(name, dimension, type_of_spawning, biomes, min_light, max_light, interval, chance, aoc, min_height, max_height, day_toggle, on_spawn)
|
||||||
local spawn_dictionary_consolidated = {}
|
|
||||||
|
|
||||||
if non_spawn_dictionary[mob_name] then
|
|
||||||
local mob_dimension = non_spawn_dictionary[mob_name][dimension]
|
|
||||||
if mob_dimension then
|
|
||||||
--minetest.log("Found in non spawn dictionary for dimension")
|
|
||||||
return mob_dimension.min_light, mob_dimension.max_light
|
|
||||||
else
|
|
||||||
--minetest.log("Found in non spawn dictionary but not for dimension")
|
|
||||||
local overworld_non_spawn_def = non_spawn_dictionary[mob_name]["overworld"]
|
|
||||||
if overworld_non_spawn_def then
|
|
||||||
return overworld_non_spawn_def.min_light, overworld_non_spawn_def.max_light
|
|
||||||
end
|
|
||||||
end
|
|
||||||
else
|
|
||||||
--minetest.log("must be in spawning dictionary")
|
|
||||||
for i,v in pairs(spawn_dictionary) do
|
|
||||||
local current_mob_name = spawn_dictionary[i].name
|
|
||||||
local current_mob_dim = spawn_dictionary[i].dimension
|
|
||||||
if mob_name == current_mob_name then
|
|
||||||
if not spawn_dictionary_consolidated[current_mob_name] then
|
|
||||||
spawn_dictionary_consolidated[current_mob_name] = {}
|
|
||||||
end
|
|
||||||
spawn_dictionary_consolidated[current_mob_name][current_mob_dim] = {
|
|
||||||
["min_light"] = spawn_dictionary[i].min_light,
|
|
||||||
["max_light"] = spawn_dictionary[i].max_light
|
|
||||||
}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if spawn_dictionary_consolidated[mob_name] then
|
|
||||||
--minetest.log("is in consolidated")
|
|
||||||
local mob_dimension = spawn_dictionary_consolidated[mob_name][dimension]
|
|
||||||
if mob_dimension then
|
|
||||||
--minetest.log("found for dimension")
|
|
||||||
return mob_dimension.min_light, mob_dimension.max_light
|
|
||||||
else
|
|
||||||
--minetest.log("not found for dimension, use overworld def")
|
|
||||||
local mob_dimension_default = spawn_dictionary_consolidated[mob_name]["overworld"]
|
|
||||||
if mob_dimension_default then
|
|
||||||
return mob_dimension_default.min_light, mob_dimension_default.max_light
|
|
||||||
end
|
|
||||||
end
|
|
||||||
else
|
|
||||||
--minetest.log("not in consolidated")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
minetest.log("action", "There are no light levels for mob (" .. tostring(mob_name) .. ") in dimension (" .. tostring(dimension) .. "). Return defaults")
|
|
||||||
return 0, minetest.LIGHT_MAX+1
|
|
||||||
end
|
|
||||||
|
|
||||||
function mcl_mobs:non_spawn_specific(mob_name,dimension,min_light,max_light)
|
|
||||||
table.insert(non_spawn_dictionary, mob_name)
|
|
||||||
non_spawn_dictionary[mob_name] = {
|
|
||||||
[dimension] = {
|
|
||||||
min_light = min_light , max_light = max_light
|
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
function mcl_mobs:spawn_specific(name, dimension, type_of_spawning, biomes, min_light, max_light, interval, chance, aoc, min_height, max_height, day_toggle, on_spawn, check_position)
|
|
||||||
|
|
||||||
-- Do mobs spawn at all?
|
-- Do mobs spawn at all?
|
||||||
if not mobs_spawn then
|
if not mobs_spawn then
|
||||||
|
@ -610,28 +418,22 @@ function mcl_mobs:spawn_specific(name, dimension, type_of_spawning, biomes, min_
|
||||||
spawn_dictionary[key]["min_height"] = min_height
|
spawn_dictionary[key]["min_height"] = min_height
|
||||||
spawn_dictionary[key]["max_height"] = max_height
|
spawn_dictionary[key]["max_height"] = max_height
|
||||||
spawn_dictionary[key]["day_toggle"] = day_toggle
|
spawn_dictionary[key]["day_toggle"] = day_toggle
|
||||||
spawn_dictionary[key]["check_position"] = check_position
|
|
||||||
|
|
||||||
summary_chance = summary_chance + chance
|
summary_chance = summary_chance + chance
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
local two_pi = 2 * math.pi
|
local two_pi = 2 * math.pi
|
||||||
local function get_next_mob_spawn_pos(pos)
|
local function get_next_mob_spawn_pos(pos)
|
||||||
-- TODO We should consider spawning something a little further away sporadically.
|
local distance = math_random(25, 32)
|
||||||
-- It would be good for sky farms and variance, rather than all being on the 24 - 32 block away radius
|
|
||||||
local distance = math_random(MOB_SPAWN_ZONE_INNER, MOB_SPAWN_ZONE_MIDDLE)
|
|
||||||
local angle = math_random() * two_pi
|
local angle = math_random() * two_pi
|
||||||
|
|
||||||
-- TODO Floor xoff and zoff and add 0.5 so it tries to spawn in the middle of the square. Less failed attempts.
|
|
||||||
local xoff = math_round(distance * math_cos(angle))
|
local xoff = math_round(distance * math_cos(angle))
|
||||||
local zoff = math_round(distance * math_sin(angle))
|
local yoff = math_round(distance * math_sin(angle))
|
||||||
return vector.offset(pos, xoff, 0, zoff)
|
return vector.offset(pos, xoff, 0, yoff)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function decypher_limits(posy)
|
local function decypher_limits(posy)
|
||||||
posy = math_floor(posy)
|
posy = math_floor(posy)
|
||||||
return posy - MOB_SPAWN_ZONE_MIDDLE, posy + MOB_SPAWN_ZONE_MIDDLE
|
return posy - 32, posy + 32
|
||||||
end
|
end
|
||||||
|
|
||||||
--a simple helper function for mob_spawn
|
--a simple helper function for mob_spawn
|
||||||
|
@ -682,20 +484,15 @@ local function has_room(self,pos)
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local function spawn_check(pos,spawn_def,ignore_caps)
|
||||||
|
if not spawn_def then return end
|
||||||
local function spawn_check(pos, spawn_def)
|
|
||||||
if not spawn_def or not pos then return end
|
|
||||||
|
|
||||||
dbg_spawn_attempts = dbg_spawn_attempts + 1
|
dbg_spawn_attempts = dbg_spawn_attempts + 1
|
||||||
local dimension = mcl_worlds.pos_to_dimension(pos)
|
local dimension = mcl_worlds.pos_to_dimension(pos)
|
||||||
local mob_def = minetest.registered_entities[spawn_def.name]
|
local mob_def = minetest.registered_entities[spawn_def.name]
|
||||||
local mob_type = mob_def.type
|
local mob_type = mob_def.type
|
||||||
local gotten_node = get_node(pos).name
|
local gotten_node = get_node(pos).name
|
||||||
local gotten_biome = minetest.get_biome_data(pos)
|
local gotten_biome = minetest.get_biome_data(pos)
|
||||||
|
|
||||||
if not gotten_node or not gotten_biome then return end
|
if not gotten_node or not gotten_biome then return end
|
||||||
|
|
||||||
gotten_biome = get_biome_name(gotten_biome.biome) --makes it easier to work with
|
gotten_biome = get_biome_name(gotten_biome.biome) --makes it easier to work with
|
||||||
|
|
||||||
local is_ground = minetest.get_item_group(gotten_node,"solid") ~= 0
|
local is_ground = minetest.get_item_group(gotten_node,"solid") ~= 0
|
||||||
|
@ -710,56 +507,33 @@ local function spawn_check(pos, spawn_def)
|
||||||
local is_leaf = get_item_group(gotten_node, "leaves") ~= 0
|
local is_leaf = get_item_group(gotten_node, "leaves") ~= 0
|
||||||
local is_bedrock = gotten_node == "mcl_core:bedrock"
|
local is_bedrock = gotten_node == "mcl_core:bedrock"
|
||||||
local is_grass = minetest.get_item_group(gotten_node,"grass_block") ~= 0
|
local is_grass = minetest.get_item_group(gotten_node,"grass_block") ~= 0
|
||||||
|
local mob_count_wide = 0
|
||||||
|
|
||||||
if pos.y >= spawn_def.min_height
|
local mob_count = 0
|
||||||
and pos.y <= spawn_def.max_height
|
if not ignore_caps then
|
||||||
and spawn_def.dimension == dimension
|
mob_count = count_mobs(pos,32,mob_type)
|
||||||
and biome_check(spawn_def.biomes, gotten_biome) then
|
mob_count_wide = count_mobs(pos,aoc_range,mob_type)
|
||||||
|
end
|
||||||
|
|
||||||
if (is_ground or spawn_def.type_of_spawning ~= "ground")
|
if pos and spawn_def
|
||||||
and (spawn_def.type_of_spawning ~= "ground" or not is_leaf)
|
and ( mob_count_wide < (mob_cap[mob_type] or 15) )
|
||||||
and (not is_farm_animal(spawn_def.name) or is_grass)
|
and ( mob_count < 5 )
|
||||||
and (spawn_def.type_of_spawning ~= "water" or is_water)
|
and pos.y >= spawn_def.min_height
|
||||||
and not is_bedrock
|
and pos.y <= spawn_def.max_height
|
||||||
and has_room(mob_def,pos)
|
and spawn_def.dimension == dimension
|
||||||
and (spawn_def.check_position and spawn_def.check_position(pos) or spawn_def.check_position == nil)
|
and biome_check(spawn_def.biomes, gotten_biome)
|
||||||
and ( not spawn_protected or not minetest.is_protected(pos, "") ) then
|
and (is_ground or spawn_def.type_of_spawning ~= "ground")
|
||||||
|
and (spawn_def.type_of_spawning ~= "ground" or not is_leaf)
|
||||||
local gotten_light = get_node_light(pos)
|
and has_room(mob_def,pos)
|
||||||
|
and (spawn_def.check_position and spawn_def.check_position(pos) or true)
|
||||||
if modern_lighting then
|
and (not is_farm_animal(spawn_def.name) or is_grass)
|
||||||
local my_node = get_node(pos)
|
and (spawn_def.type_of_spawning ~= "water" or is_water)
|
||||||
local sky_light = minetest.get_natural_light(pos)
|
and ( not spawn_protected or not minetest.is_protected(pos, "") )
|
||||||
local art_light = minetest.get_artificial_light(my_node.param1)
|
and not is_bedrock then
|
||||||
|
--only need to poll for node light if everything else worked
|
||||||
if dimension == "nether" then
|
local gotten_light = get_node_light(pos)
|
||||||
if art_light <= nether_threshold then
|
if gotten_light >= spawn_def.min_light and gotten_light <= spawn_def.max_light then
|
||||||
return true
|
return true
|
||||||
end
|
|
||||||
elseif dimension == "end" then
|
|
||||||
if art_light <= end_threshold then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
elseif dimension == "overworld" then
|
|
||||||
if mob_type == "monster" then
|
|
||||||
if mob_def.spawn_check then
|
|
||||||
return mob_def.spawn_check(pos, gotten_light, art_light, sky_light)
|
|
||||||
elseif art_light <= overworld_threshold and sky_light <= overworld_sky_threshold then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
else
|
|
||||||
if mob_def.spawn_check then
|
|
||||||
return mob_def.spawn_check(pos, gotten_light, art_light, sky_light)
|
|
||||||
elseif gotten_light > overworld_passive_threshold then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
else
|
|
||||||
if gotten_light >= spawn_def.min_light and gotten_light <= spawn_def.max_light then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
|
@ -779,7 +553,8 @@ function mcl_mobs.spawn(pos,id)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
local function spawn_group(p,mob,spawn_on,amount_to_spawn)
|
local function spawn_group(p,mob,spawn_on,group_max,group_min)
|
||||||
|
if not group_min then group_min = 1 end
|
||||||
local nn= minetest.find_nodes_in_area_under_air(vector.offset(p,-5,-3,-5),vector.offset(p,5,3,5),spawn_on)
|
local nn= minetest.find_nodes_in_area_under_air(vector.offset(p,-5,-3,-5),vector.offset(p,5,3,5),spawn_on)
|
||||||
local o
|
local o
|
||||||
table.shuffle(nn)
|
table.shuffle(nn)
|
||||||
|
@ -787,10 +562,9 @@ local function spawn_group(p,mob,spawn_on,amount_to_spawn)
|
||||||
nn = {}
|
nn = {}
|
||||||
table.insert(nn,p)
|
table.insert(nn,p)
|
||||||
end
|
end
|
||||||
|
for i = 1, math.random(group_min,group_max) do
|
||||||
for i = 1, amount_to_spawn do
|
|
||||||
local sp = vector.offset(nn[math.random(#nn)],0,1,0)
|
local sp = vector.offset(nn[math.random(#nn)],0,1,0)
|
||||||
if spawn_check(nn[math.random(#nn)],mob) then
|
if spawn_check(nn[math.random(#nn)],mob,true) then
|
||||||
if mob.type_of_spawning == "water" then
|
if mob.type_of_spawning == "water" then
|
||||||
sp = get_water_spawn(sp)
|
sp = get_water_spawn(sp)
|
||||||
end
|
end
|
||||||
|
@ -881,121 +655,25 @@ if mobs_spawn then
|
||||||
-- Get pos to spawn, x and z are randomised, y is range
|
-- Get pos to spawn, x and z are randomised, y is range
|
||||||
|
|
||||||
|
|
||||||
local function mob_cap_space (pos, mob_type, mob_counts_close, mob_counts_wide, cap_space_hostile, cap_space_non_hostile)
|
local function spawn_a_mob(pos, dimension, y_min, y_max)
|
||||||
|
--create a disconnected clone of the spawn dictionary
|
||||||
-- Some mob examples
|
--prevents memory leak
|
||||||
--type = "monster", spawn_class = "hostile",
|
|
||||||
--type = "animal", spawn_class = "passive",
|
|
||||||
--local cod = { type = "animal", spawn_class = "water",
|
|
||||||
|
|
||||||
local type_cap = mob_cap[mob_type] or MISSING_CAP_DEFAULT
|
|
||||||
local close_zone_cap = MOBS_CAP_CLOSE
|
|
||||||
|
|
||||||
local mob_total_wide = mob_counts_wide[mob_type]
|
|
||||||
if not mob_total_wide then
|
|
||||||
--mcl_log("none of type found. set as 0")
|
|
||||||
mob_total_wide = 0
|
|
||||||
end
|
|
||||||
|
|
||||||
local cap_space_wide = math.max(type_cap - mob_total_wide, 0)
|
|
||||||
|
|
||||||
mcl_log("mob_type", mob_type)
|
|
||||||
mcl_log("cap_space_wide", cap_space_wide)
|
|
||||||
|
|
||||||
local cap_space_available = 0
|
|
||||||
if mob_type == "hostile" then
|
|
||||||
mcl_log("cap_space_global", cap_space_hostile)
|
|
||||||
cap_space_available = math.min(cap_space_hostile, cap_space_wide)
|
|
||||||
else
|
|
||||||
mcl_log("cap_space_global", cap_space_non_hostile)
|
|
||||||
cap_space_available = math.min(cap_space_non_hostile, cap_space_wide)
|
|
||||||
end
|
|
||||||
|
|
||||||
local mob_total_close = mob_counts_close[mob_type]
|
|
||||||
if not mob_total_close then
|
|
||||||
--mcl_log("none of type found. set as 0")
|
|
||||||
mob_total_close = 0
|
|
||||||
end
|
|
||||||
|
|
||||||
local cap_space_close = math.max(close_zone_cap - mob_total_close, 0)
|
|
||||||
cap_space_available = math.min(cap_space_available, cap_space_close)
|
|
||||||
|
|
||||||
mcl_log("cap_space_close", cap_space_close)
|
|
||||||
mcl_log("cap_space_available", cap_space_available)
|
|
||||||
|
|
||||||
if false and mob_type == "water" then
|
|
||||||
mcl_log("mob_type: " .. mob_type .. " and pos: " .. minetest.pos_to_string(pos))
|
|
||||||
mcl_log("wide: " .. mob_total_wide .. "/" .. type_cap)
|
|
||||||
mcl_log("cap_space_wide: " .. cap_space_wide)
|
|
||||||
mcl_log("close: " .. mob_total_close .. "/" .. close_zone_cap)
|
|
||||||
mcl_log("cap_space_close: " .. cap_space_close)
|
|
||||||
end
|
|
||||||
|
|
||||||
return cap_space_available
|
|
||||||
end
|
|
||||||
|
|
||||||
local function find_spawning_position(pos, max_times)
|
|
||||||
local spawning_position
|
|
||||||
|
|
||||||
local max_loops = 1
|
|
||||||
if max_times then max_loops = max_times end
|
|
||||||
|
|
||||||
local y_min, y_max = decypher_limits(pos.y)
|
|
||||||
|
|
||||||
--mcl_log("mapgen_limit: " .. SPAWN_MAPGEN_LIMIT)
|
|
||||||
local i = 0
|
|
||||||
repeat
|
|
||||||
local goal_pos = get_next_mob_spawn_pos(pos)
|
|
||||||
|
|
||||||
if math.abs(goal_pos.x) <= SPAWN_MAPGEN_LIMIT and math.abs(pos.y) <= SPAWN_MAPGEN_LIMIT and math.abs(goal_pos.z) <= SPAWN_MAPGEN_LIMIT then
|
|
||||||
local spawning_position_list = find_nodes_in_area_under_air(
|
|
||||||
{x = goal_pos.x, y = y_min, z = goal_pos.z},
|
|
||||||
{x = goal_pos.x, y = y_max, z = goal_pos.z},
|
|
||||||
{"group:solid", "group:water", "group:lava"}
|
|
||||||
)
|
|
||||||
if #spawning_position_list > 0 then
|
|
||||||
mcl_log("Spawning positions available: " .. minetest.pos_to_string(goal_pos))
|
|
||||||
spawning_position = spawning_position_list[math_random(1, #spawning_position_list)]
|
|
||||||
else
|
|
||||||
mcl_log("Spawning position isn't good. Do not spawn: " .. minetest.pos_to_string(goal_pos))
|
|
||||||
end
|
|
||||||
|
|
||||||
else
|
|
||||||
mcl_log("Pos outside mapgen limits: " .. minetest.pos_to_string(goal_pos))
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
i = i + 1
|
|
||||||
if i >= max_loops then
|
|
||||||
mcl_log("Cancel finding spawn positions at: " .. max_loops)
|
|
||||||
break
|
|
||||||
end
|
|
||||||
until spawning_position
|
|
||||||
return spawning_position
|
|
||||||
end
|
|
||||||
|
|
||||||
local function spawn_a_mob(pos, cap_space_hostile, cap_space_non_hostile)
|
|
||||||
--create a disconnected clone of the spawn dictionary, prevents memory leak
|
|
||||||
local mob_library_worker_table = table_copy(spawn_dictionary)
|
local mob_library_worker_table = table_copy(spawn_dictionary)
|
||||||
|
local goal_pos = get_next_mob_spawn_pos(pos)
|
||||||
local spawning_position = find_spawning_position(pos, FIND_SPAWN_POS_RETRIES)
|
|
||||||
if not spawning_position then
|
|
||||||
minetest.log("action", "[Mobs spawn] Cannot find a valid spawn position after retries: " .. FIND_SPAWN_POS_RETRIES)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local mob_counts_close, mob_counts_wide, total_mobs = count_mobs_all("spawn_class", spawning_position)
|
|
||||||
--output_mob_stats(mob_counts_close, total_mobs)
|
|
||||||
--output_mob_stats(mob_counts_wide)
|
|
||||||
|
|
||||||
--grab mob that fits into the spawning location
|
--grab mob that fits into the spawning location
|
||||||
--randomly grab a mob, don't exclude any possibilities
|
--randomly grab a mob, don't exclude any possibilities
|
||||||
|
local spawning_position_list = find_nodes_in_area_under_air(
|
||||||
|
{x = goal_pos.x, y = y_min, z = goal_pos.z},
|
||||||
|
{x = goal_pos.x, y = y_max, z = goal_pos.z},
|
||||||
|
{"group:solid", "group:water", "group:lava"}
|
||||||
|
)
|
||||||
|
if #spawning_position_list <= 0 then return end
|
||||||
|
local spawning_position = spawning_position_list[math_random(1, #spawning_position_list)]
|
||||||
|
|
||||||
perlin_noise = perlin_noise or minetest_get_perlin(noise_params)
|
perlin_noise = perlin_noise or minetest_get_perlin(noise_params)
|
||||||
local noise = perlin_noise:get_3d(spawning_position)
|
local noise = perlin_noise:get_3d(spawning_position)
|
||||||
local current_summary_chance = summary_chance
|
local current_summary_chance = summary_chance
|
||||||
|
|
||||||
table.shuffle(mob_library_worker_table)
|
table.shuffle(mob_library_worker_table)
|
||||||
|
|
||||||
while #mob_library_worker_table > 0 do
|
while #mob_library_worker_table > 0 do
|
||||||
local mob_chance_offset = (math_round(noise * current_summary_chance + 12345) % current_summary_chance) + 1
|
local mob_chance_offset = (math_round(noise * current_summary_chance + 12345) % current_summary_chance) + 1
|
||||||
local mob_index = 1
|
local mob_index = 1
|
||||||
|
@ -1006,88 +684,39 @@ if mobs_spawn then
|
||||||
mob_chance = mob_library_worker_table[mob_index].chance
|
mob_chance = mob_library_worker_table[mob_index].chance
|
||||||
step_chance = step_chance + mob_chance
|
step_chance = step_chance + mob_chance
|
||||||
end
|
end
|
||||||
--minetest.log(mob_def.name.." "..step_chance.. " "..mob_chance)
|
|
||||||
|
|
||||||
local mob_def = mob_library_worker_table[mob_index]
|
local mob_def = mob_library_worker_table[mob_index]
|
||||||
|
--minetest.log(mob_def.name.." "..step_chance.. " "..mob_chance)
|
||||||
if mob_def and mob_def.name and minetest.registered_entities[mob_def.name] then
|
if mob_def and mob_def.name and minetest.registered_entities[mob_def.name] then
|
||||||
|
local spawn_in_group = minetest.registered_entities[mob_def.name].spawn_in_group or 4
|
||||||
local mob_def_ent = minetest.registered_entities[mob_def.name]
|
local spawn_in_group_min = minetest.registered_entities[mob_def.name].spawn_in_group_min or 1
|
||||||
local mob_spawn_class = mob_def_ent.spawn_class
|
local mob_type = minetest.registered_entities[mob_def.name].type
|
||||||
|
if spawn_check(spawning_position,mob_def) then
|
||||||
local cap_space_available = mob_cap_space (spawning_position, mob_spawn_class, mob_counts_close, mob_counts_wide, cap_space_hostile, cap_space_non_hostile)
|
if mob_def.type_of_spawning == "water" then
|
||||||
|
spawning_position = get_water_spawn(spawning_position)
|
||||||
if cap_space_available > 0 then
|
if not spawning_position then
|
||||||
--mcl_log("Cap space available")
|
minetest.log("warning","[mcl_mobs] no water spawn for mob "..mob_def.name.." found at "..minetest.pos_to_string(vector.round(pos)))
|
||||||
|
|
||||||
-- Spawn caps for animals and water creatures fill up rapidly. Need to throttle this somewhat
|
|
||||||
-- for performance and for early game challenge. We don't want to reduce hostiles though.
|
|
||||||
local spawn_hostile = (mob_spawn_class == "hostile")
|
|
||||||
local spawn_passive = (mob_spawn_class ~= "hostile") and math.random(100) < peaceful_percentage_spawned
|
|
||||||
|
|
||||||
--mcl_log("Spawn_passive: " .. tostring(spawn_passive))
|
|
||||||
--mcl_log("Spawn_hostile: " .. tostring(spawn_hostile))
|
|
||||||
|
|
||||||
if (spawn_hostile or spawn_passive) and spawn_check(spawning_position,mob_def) then
|
|
||||||
if mob_def.type_of_spawning == "water" then
|
|
||||||
spawning_position = get_water_spawn(spawning_position)
|
|
||||||
if not spawning_position then
|
|
||||||
minetest.log("warning","[mcl_mobs] no water spawn for mob "..mob_def.name.." found at "..minetest.pos_to_string(vector.round(pos)))
|
|
||||||
return
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if mob_def_ent.can_spawn and not mob_def_ent.can_spawn(spawning_position) then
|
|
||||||
minetest.log("warning","[mcl_mobs] mob "..mob_def.name.." refused to spawn at "..minetest.pos_to_string(vector.round(spawning_position)))
|
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
--everything is correct, spawn mob
|
|
||||||
local spawn_in_group = mob_def_ent.spawn_in_group or 4
|
|
||||||
|
|
||||||
local spawn_group_hostile = (mob_spawn_class == "hostile") and (math.random(100) < hostile_group_percentage_spawned)
|
|
||||||
local spawn_group_passive = (mob_spawn_class ~= "hostile") and (math.random(100) < peaceful_group_percentage_spawned)
|
|
||||||
|
|
||||||
mcl_log("spawn_group_hostile: " .. tostring(spawn_group_hostile))
|
|
||||||
mcl_log("spawn_group_passive: " .. tostring(spawn_group_passive))
|
|
||||||
|
|
||||||
local spawned
|
|
||||||
if spawn_in_group and (spawn_group_hostile or spawn_group_passive) then
|
|
||||||
local group_min = mob_def_ent.spawn_in_group_min or 1
|
|
||||||
if not group_min then group_min = 1 end
|
|
||||||
|
|
||||||
local amount_to_spawn = math.random(group_min, spawn_in_group)
|
|
||||||
mcl_log("Spawning quantity: " .. amount_to_spawn)
|
|
||||||
amount_to_spawn = math.min(amount_to_spawn, cap_space_available)
|
|
||||||
mcl_log("throttled spawning quantity: " .. amount_to_spawn)
|
|
||||||
|
|
||||||
if logging then
|
|
||||||
minetest.log("action", "[mcl_mobs] A group of " ..amount_to_spawn .. " " .. mob_def.name .. " mob spawns on " ..minetest.get_node(vector.offset(spawning_position,0,-1,0)).name .." at " .. minetest.pos_to_string(spawning_position, 1))
|
|
||||||
end
|
|
||||||
spawned = spawn_group(spawning_position,mob_def,{minetest.get_node(vector.offset(spawning_position,0,-1,0)).name}, amount_to_spawn)
|
|
||||||
else
|
|
||||||
if logging then
|
|
||||||
minetest.log("action", "[mcl_mobs] Mob " .. mob_def.name .. " spawns on " ..minetest.get_node(vector.offset(spawning_position,0,-1,0)).name .." at ".. minetest.pos_to_string(spawning_position, 1))
|
|
||||||
end
|
|
||||||
spawned = mcl_mobs.spawn(spawning_position, mob_def.name)
|
|
||||||
end
|
|
||||||
|
|
||||||
if spawned then
|
|
||||||
--mcl_log("We have spawned")
|
|
||||||
mob_counts_close, mob_counts_wide, total_mobs = count_mobs_all("spawn_class", pos)
|
|
||||||
local new_spawning_position = find_spawning_position(pos, FIND_SPAWN_POS_RETRIES_SUCCESS_RESPIN)
|
|
||||||
if new_spawning_position then
|
|
||||||
mcl_log("Setting new spawning position")
|
|
||||||
spawning_position = new_spawning_position
|
|
||||||
else
|
|
||||||
mcl_log("Cannot set new spawning position")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
else
|
|
||||||
--mcl_log("Spawn check failed")
|
|
||||||
end
|
end
|
||||||
else
|
if minetest.registered_entities[mob_def.name].can_spawn and not minetest.registered_entities[mob_def.name].can_spawn(spawning_position) then
|
||||||
--mcl_log("Cap space full")
|
minetest.log("warning","[mcl_mobs] mob "..mob_def.name.." refused to spawn at "..minetest.pos_to_string(vector.round(spawning_position)))
|
||||||
end
|
return
|
||||||
|
end
|
||||||
|
--everything is correct, spawn mob
|
||||||
|
local object
|
||||||
|
if spawn_in_group and ( mob_type ~= "monster" or math.random(5) == 1 ) then
|
||||||
|
if logging then
|
||||||
|
minetest.log("action", "[mcl_mobs] A group of mob " .. mob_def.name .. " spawns on " ..minetest.get_node(vector.offset(spawning_position,0,-1,0)).name .." at " .. minetest.pos_to_string(spawning_position, 1))
|
||||||
|
end
|
||||||
|
object = spawn_group(spawning_position,mob_def,{minetest.get_node(vector.offset(spawning_position,0,-1,0)).name},spawn_in_group,spawn_in_group_min)
|
||||||
|
|
||||||
|
else
|
||||||
|
if logging then
|
||||||
|
minetest.log("action", "[mcl_mobs] Mob " .. mob_def.name .. " spawns on " ..minetest.get_node(vector.offset(spawning_position,0,-1,0)).name .." at ".. minetest.pos_to_string(spawning_position, 1))
|
||||||
|
end
|
||||||
|
object = mcl_mobs.spawn(spawning_position, mob_def.name)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
current_summary_chance = current_summary_chance - mob_chance
|
current_summary_chance = current_summary_chance - mob_chance
|
||||||
table_remove(mob_library_worker_table, mob_index)
|
table_remove(mob_library_worker_table, mob_index)
|
||||||
|
@ -1099,72 +728,36 @@ if mobs_spawn then
|
||||||
|
|
||||||
local timer = 0
|
local timer = 0
|
||||||
minetest.register_globalstep(function(dtime)
|
minetest.register_globalstep(function(dtime)
|
||||||
|
|
||||||
timer = timer + dtime
|
timer = timer + dtime
|
||||||
if timer < WAIT_FOR_SPAWN_ATTEMPT then return end
|
if timer < 10 then return end
|
||||||
timer = 0
|
timer = 0
|
||||||
|
|
||||||
local players = get_connected_players()
|
local players = get_connected_players()
|
||||||
local total_mobs, total_non_hostile, total_hostile = count_mobs_total_cap()
|
local total_mobs = count_mobs_total_cap()
|
||||||
|
|
||||||
local cap_space_hostile = math.max(mob_cap.global_hostile - total_hostile, 0)
|
|
||||||
local cap_space_non_hostile = math.max(mob_cap.global_non_hostile - total_non_hostile, 0)
|
|
||||||
mcl_log("global cap_space_hostile", cap_space_hostile)
|
|
||||||
mcl_log("global cap_space_non_hostile", cap_space_non_hostile)
|
|
||||||
|
|
||||||
if total_mobs > mob_cap.total or total_mobs > #players * mob_cap.player then
|
if total_mobs > mob_cap.total or total_mobs > #players * mob_cap.player then
|
||||||
minetest.log("action","[mcl_mobs] global mob cap reached. no cycle spawning.")
|
minetest.log("action","[mcl_mobs] global mob cap reached. no cycle spawning.")
|
||||||
return
|
return
|
||||||
end --mob cap per player
|
end --mob cap per player
|
||||||
|
|
||||||
for _, player in pairs(players) do
|
for _, player in pairs(players) do
|
||||||
local pos = player:get_pos()
|
local pos = player:get_pos()
|
||||||
local dimension = mcl_worlds.pos_to_dimension(pos)
|
local dimension = mcl_worlds.pos_to_dimension(pos)
|
||||||
-- ignore void and unloaded area
|
-- ignore void and unloaded area
|
||||||
if dimension ~= "void" and dimension ~= "default" then
|
if dimension ~= "void" and dimension ~= "default" then
|
||||||
spawn_a_mob(pos, cap_space_hostile, cap_space_non_hostile)
|
local y_min, y_max = decypher_limits(pos.y)
|
||||||
|
spawn_a_mob(pos, dimension, y_min, y_max)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function despawn_allowed(self)
|
|
||||||
local nametag = self.nametag and self.nametag ~= ""
|
|
||||||
local not_busy = self.state ~= "attack" and self.following == nil
|
|
||||||
if self.can_despawn == true then
|
|
||||||
if not nametag and not_busy and not self.tamed == true and not self.persistent == true then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
function mob_class:despawn_allowed()
|
|
||||||
despawn_allowed(self)
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
assert(despawn_allowed({can_despawn=false}) == false, "despawn_allowed - can_despawn false failed")
|
|
||||||
assert(despawn_allowed({can_despawn=true}) == true, "despawn_allowed - can_despawn true failed")
|
|
||||||
|
|
||||||
assert(despawn_allowed({can_despawn=true, nametag=""}) == true, "despawn_allowed - blank nametag failed")
|
|
||||||
assert(despawn_allowed({can_despawn=true, nametag=nil}) == true, "despawn_allowed - nil nametag failed")
|
|
||||||
assert(despawn_allowed({can_despawn=true, nametag="bob"}) == false, "despawn_allowed - nametag failed")
|
|
||||||
|
|
||||||
assert(despawn_allowed({can_despawn=true, state="attack"}) == false, "despawn_allowed - attack state failed")
|
|
||||||
assert(despawn_allowed({can_despawn=true, following="blah"}) == false, "despawn_allowed - following state failed")
|
|
||||||
|
|
||||||
assert(despawn_allowed({can_despawn=true, tamed=false}) == true, "despawn_allowed - not tamed")
|
|
||||||
assert(despawn_allowed({can_despawn=true, tamed=true}) == false, "despawn_allowed - tamed")
|
|
||||||
|
|
||||||
assert(despawn_allowed({can_despawn=true, persistent=true}) == false, "despawn_allowed - persistent")
|
|
||||||
assert(despawn_allowed({can_despawn=true, persistent=false}) == true, "despawn_allowed - not persistent")
|
|
||||||
|
|
||||||
function mob_class:check_despawn(pos, dtime)
|
function mob_class:check_despawn(pos, dtime)
|
||||||
self.lifetimer = self.lifetimer - dtime
|
self.lifetimer = self.lifetimer - dtime
|
||||||
|
|
||||||
-- Despawning: when lifetimer expires, remove mob
|
-- Despawning: when lifetimer expires, remove mob
|
||||||
if remove_far and despawn_allowed(self) then
|
if remove_far
|
||||||
|
and self.can_despawn == true
|
||||||
|
and ((not self.nametag) or (self.nametag == ""))
|
||||||
|
and self.state ~= "attack"
|
||||||
|
and self.following == nil then
|
||||||
if self.despawn_immediately or self.lifetimer <= 0 then
|
if self.despawn_immediately or self.lifetimer <= 0 then
|
||||||
if logging then
|
if logging then
|
||||||
minetest.log("action", "[mcl_mobs] Mob "..self.name.." despawns at "..minetest.pos_to_string(pos, 1) .. " lifetimer ran out")
|
minetest.log("action", "[mcl_mobs] Mob "..self.name.." despawns at "..minetest.pos_to_string(pos, 1) .. " lifetimer ran out")
|
||||||
|
@ -1182,16 +775,27 @@ function mob_class:check_despawn(pos, dtime)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
minetest.register_chatcommand("mobstats",{
|
minetest.register_chatcommand("mobstats",{
|
||||||
privs = { debug = true },
|
privs = { debug = true },
|
||||||
func = function(n,param)
|
func = function(n,param)
|
||||||
--minetest.chat_send_player(n,dump(dbg_spawn_counts))
|
minetest.chat_send_player(n,dump(dbg_spawn_counts))
|
||||||
local pos = minetest.get_player_by_name(n):get_pos()
|
local pos = minetest.get_player_by_name(n):get_pos()
|
||||||
minetest.chat_send_player(n,"mobs: within 32 radius of player/total loaded :"..count_mobs(pos,MOB_CAP_INNER_RADIUS) .. "/" .. count_mobs_total())
|
minetest.chat_send_player(n,"mobs within 32 radius of player:"..count_mobs(pos,32))
|
||||||
minetest.chat_send_player(n,"spawning attempts since server start:" .. dbg_spawn_succ .. "/" .. dbg_spawn_attempts)
|
minetest.chat_send_player(n,"total mobs:"..count_mobs_total())
|
||||||
|
minetest.chat_send_player(n,"spawning attempts since server start:"..dbg_spawn_attempts)
|
||||||
|
minetest.chat_send_player(n,"successful spawns since server start:"..dbg_spawn_succ)
|
||||||
|
|
||||||
|
|
||||||
|
local mob_counts, total_mobs = count_mobs_all()
|
||||||
|
if (total_mobs) then
|
||||||
|
minetest.log("action", "Total mobs found: " .. total_mobs)
|
||||||
|
end
|
||||||
|
if mob_counts then
|
||||||
|
for k, v1 in pairs(mob_counts) do
|
||||||
|
minetest.log("action", "k: " .. tostring(k))
|
||||||
|
minetest.log("action", "v1: " .. tostring(v1))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local mob_counts_close, mob_counts_wide, total_mobs = count_mobs_all("name") -- Can use "type"
|
|
||||||
output_mob_stats(mob_counts_wide, total_mobs, true)
|
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
# textdomain:mcl_paintings
|
|
||||||
Painting=Maleri
|
|
|
@ -1,2 +0,0 @@
|
||||||
# textdomain:mcl_paintings
|
|
||||||
Painting=Cuadro
|
|
|
@ -1,2 +1,2 @@
|
||||||
# textdomain:mcl_paintings
|
# textdomain:mcl_paintings
|
||||||
Painting=Картина
|
Painting=Рисование
|
||||||
|
|
|
@ -2,9 +2,6 @@ local dim = {"x", "z"}
|
||||||
|
|
||||||
local modpath = minetest.get_modpath(minetest.get_current_modname())
|
local modpath = minetest.get_modpath(minetest.get_current_modname())
|
||||||
|
|
||||||
local anti_troll = minetest.settings:get_bool("wither_anti_troll_measures", false)
|
|
||||||
local peaceful = minetest.settings:get_bool("only_peaceful_mobs", false)
|
|
||||||
|
|
||||||
local function load_schem(filename)
|
local function load_schem(filename)
|
||||||
local file = io.open(modpath .. "/schems/" .. filename, "r")
|
local file = io.open(modpath .. "/schems/" .. filename, "r")
|
||||||
local data = minetest.deserialize(file:read())
|
local data = minetest.deserialize(file:read())
|
||||||
|
@ -12,14 +9,6 @@ local function load_schem(filename)
|
||||||
return data
|
return data
|
||||||
end
|
end
|
||||||
|
|
||||||
local wboss_overworld = 0
|
|
||||||
local wboss_nether = 0
|
|
||||||
local wboss_end = 0
|
|
||||||
|
|
||||||
local LIM_OVERWORLD = tonumber(minetest.settings:get("wither_cap_overworld")) or 3
|
|
||||||
local LIM_NETHER = tonumber(minetest.settings:get("wither_cap_nether")) or 10
|
|
||||||
local LIM_END = tonumber(minetest.settings:get("wither_cap_end")) or 5
|
|
||||||
|
|
||||||
local wither_spawn_schems = {}
|
local wither_spawn_schems = {}
|
||||||
|
|
||||||
for _, d in pairs(dim) do
|
for _, d in pairs(dim) do
|
||||||
|
@ -27,13 +16,8 @@ for _, d in pairs(dim) do
|
||||||
end
|
end
|
||||||
|
|
||||||
local function check_schem(pos, schem)
|
local function check_schem(pos, schem)
|
||||||
local cn_name
|
|
||||||
for _, n in pairs(schem) do
|
for _, n in pairs(schem) do
|
||||||
cn_name = minetest.get_node(vector.add(pos, n)).name
|
if minetest.get_node(vector.add(pos, n)).name ~= n.name then
|
||||||
if string.find(cn_name, "mcl_heads:wither_skeleton") then
|
|
||||||
cn_name = "mcl_heads:wither_skeleton"
|
|
||||||
end
|
|
||||||
if cn_name ~= n.name then
|
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -46,32 +30,14 @@ local function remove_schem(pos, schem)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local function check_limit(pos)
|
local function wither_spawn(pos)
|
||||||
local dim = mcl_worlds.pos_to_dimension(pos)
|
|
||||||
if dim == "overworld" and wboss_overworld >= LIM_OVERWORLD then return false
|
|
||||||
elseif dim == "end" and wboss_end >= LIM_END then return false
|
|
||||||
elseif wboss_nether >= LIM_NETHER then return false
|
|
||||||
else return true end
|
|
||||||
end
|
|
||||||
|
|
||||||
local function wither_spawn(pos, player)
|
|
||||||
if peaceful then return end
|
|
||||||
for _, d in pairs(dim) do
|
for _, d in pairs(dim) do
|
||||||
for i = 0, 2 do
|
for i = 0, 2 do
|
||||||
local p = vector.add(pos, {x = 0, y = -2, z = 0, [d] = -i})
|
local p = vector.add(pos, {x = 0, y = -2, z = 0, [d] = -i})
|
||||||
local schem = wither_spawn_schems[d]
|
local schem = wither_spawn_schems[d]
|
||||||
if check_schem(p, schem) and (not anti_troll or check_limit(pos)) then
|
if check_schem(p, schem) then
|
||||||
remove_schem(p, schem)
|
remove_schem(p, schem)
|
||||||
local wither = minetest.add_entity(vector.add(p, {x = 0, y = 1, z = 0, [d] = 1}), "mobs_mc:wither")
|
minetest.add_entity(vector.add(p, {x = 0, y = 1, z = 0, [d] = 1}), "mobs_mc:wither")
|
||||||
if not wither then return end
|
|
||||||
local wither_ent = wither:get_luaentity()
|
|
||||||
wither_ent._spawner = player:get_player_name()
|
|
||||||
local dim = mcl_worlds.pos_to_dimension(pos)
|
|
||||||
if dim == "overworld" then
|
|
||||||
wboss_overworld = wboss_overworld + 1
|
|
||||||
elseif dim == "end" then
|
|
||||||
wboss_end = wboss_end + 1
|
|
||||||
else wboss_nether = wboss_nether + 1 end
|
|
||||||
local objects = minetest.get_objects_inside_radius(pos, 20)
|
local objects = minetest.get_objects_inside_radius(pos, 20)
|
||||||
for _, players in ipairs(objects) do
|
for _, players in ipairs(objects) do
|
||||||
if players:is_player() then
|
if players:is_player() then
|
||||||
|
@ -88,19 +54,7 @@ local old_on_place = wither_head.on_place
|
||||||
function wither_head.on_place(itemstack, placer, pointed)
|
function wither_head.on_place(itemstack, placer, pointed)
|
||||||
local n = minetest.get_node(vector.offset(pointed.above,0,-1,0))
|
local n = minetest.get_node(vector.offset(pointed.above,0,-1,0))
|
||||||
if n and n.name == "mcl_nether:soul_sand" then
|
if n and n.name == "mcl_nether:soul_sand" then
|
||||||
minetest.after(0, wither_spawn, pointed.above, placer)
|
minetest.after(0, wither_spawn, pointed.above)
|
||||||
end
|
end
|
||||||
return old_on_place(itemstack, placer, pointed)
|
return old_on_place(itemstack, placer, pointed)
|
||||||
end
|
end
|
||||||
|
|
||||||
if anti_troll then
|
|
||||||
-- pull wither counts per dimension
|
|
||||||
minetest.register_globalstep(function(dtime)
|
|
||||||
wboss_overworld = mobs_mc.wither_count_overworld
|
|
||||||
wboss_nether = mobs_mc.wither_count_nether
|
|
||||||
wboss_end = mobs_mc.wither_count_end
|
|
||||||
mobs_mc.wither_count_overworld = 0
|
|
||||||
mobs_mc.wither_count_nether = 0
|
|
||||||
mobs_mc.wither_count_end = 0
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
|
|
|
@ -191,10 +191,9 @@ Origin of those models:
|
||||||
* [Spennnyyy](https://freesound.org/people/Spennnyyy/) (CC0)
|
* [Spennnyyy](https://freesound.org/people/Spennnyyy/) (CC0)
|
||||||
* `mcl_totems_totem.ogg`
|
* `mcl_totems_totem.ogg`
|
||||||
* Source: <https://freesound.org/people/Spennnyyy/sounds/323502/>
|
* Source: <https://freesound.org/people/Spennnyyy/sounds/323502/>
|
||||||
* [Baŝto](https://opengameart.org/users/ba%C5%9Dto) (remixer) and [kantouth](https://freesound.org/people/kantouth/) (original author)
|
* [Baŝto](https://opengameart.org/users/ba%C5%9Dto)
|
||||||
* `mobs_mc_skeleton_random.*.ogg` (CC BY 3.0)
|
* `mobs_mc_skeleton_random.*.ogg` (CC BY 3.0)
|
||||||
* Source: <https://opengameart.org/content/walking-skeleton>
|
* Source: <https://opengameart.org/content/walking-skeleton>
|
||||||
* Based on: <https://freesound.org/people/kantouth/sounds/115113/>
|
|
||||||
* [spookymodem](https://freesound.org/people/spookymodem/)
|
* [spookymodem](https://freesound.org/people/spookymodem/)
|
||||||
* `mobs_mc_skeleton_death.ogg` (CC0)
|
* `mobs_mc_skeleton_death.ogg` (CC0)
|
||||||
* <https://freesound.org/people/spookymodem/sounds/202091/>
|
* <https://freesound.org/people/spookymodem/sounds/202091/>
|
||||||
|
@ -308,4 +307,4 @@ Origin of those models:
|
||||||
|
|
||||||
Note: Many of these sounds have been more or less modified to fit the game.
|
Note: Many of these sounds have been more or less modified to fit the game.
|
||||||
|
|
||||||
Sounds not mentioned here are licensed under CC0.
|
Sounds not mentioned hre are licensed under CC0.
|
||||||
|
|
|
@ -39,7 +39,7 @@ This mod adds mobs which closely resemble the mobs from the game Minecraft, vers
|
||||||
* Cave Spider
|
* Cave Spider
|
||||||
* Enderman
|
* Enderman
|
||||||
* Zombie Villager
|
* Zombie Villager
|
||||||
* Zombie Piglin
|
* Zombie Pigman
|
||||||
* Wither Skeleton
|
* Wither Skeleton
|
||||||
* Magma Cube
|
* Magma Cube
|
||||||
* Blaze
|
* Blaze
|
||||||
|
|
|
@ -2,7 +2,7 @@ local S = minetest.get_translator(minetest.get_current_modname())
|
||||||
|
|
||||||
local axolotl = {
|
local axolotl = {
|
||||||
type = "animal",
|
type = "animal",
|
||||||
spawn_class = "axolotl",
|
spawn_class = "water",
|
||||||
can_despawn = true,
|
can_despawn = true,
|
||||||
passive = false,
|
passive = false,
|
||||||
hp_min = 14,
|
hp_min = 14,
|
||||||
|
@ -13,7 +13,7 @@ local axolotl = {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = -1,
|
bone_eye_height = -1,
|
||||||
head_eye_height = -0.5,
|
head_eye_height = -0.5,
|
||||||
horizontal_head_height = 0,
|
horrizonatal_head_height = 0,
|
||||||
curiosity = 10,
|
curiosity = 10,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
|
|
||||||
|
@ -78,6 +78,7 @@ local axolotl = {
|
||||||
attack_animals = true,
|
attack_animals = true,
|
||||||
specific_attack = {
|
specific_attack = {
|
||||||
"extra_mobs_cod",
|
"extra_mobs_cod",
|
||||||
|
"mobs_mc:sheep",
|
||||||
"extra_mobs_glow_squid",
|
"extra_mobs_glow_squid",
|
||||||
"extra_mobs_salmon",
|
"extra_mobs_salmon",
|
||||||
"extra_mobs_tropical_fish",
|
"extra_mobs_tropical_fish",
|
||||||
|
|
|
@ -2,18 +2,6 @@
|
||||||
|
|
||||||
local S = minetest.get_translator("mobs_mc")
|
local S = minetest.get_translator("mobs_mc")
|
||||||
|
|
||||||
local function spawn_check(pos, environmental_light, artificial_light, sky_light)
|
|
||||||
local date = os.date("*t")
|
|
||||||
local maxlight
|
|
||||||
if (date.month == 10 and date.day >= 20) or (date.month == 11 and date.day <= 3) then
|
|
||||||
maxlight = 6
|
|
||||||
else
|
|
||||||
maxlight = 3
|
|
||||||
end
|
|
||||||
|
|
||||||
return artificial_light <= maxlight
|
|
||||||
end
|
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:bat", {
|
mcl_mobs.register_mob("mobs_mc:bat", {
|
||||||
description = S("Bat"),
|
description = S("Bat"),
|
||||||
type = "animal",
|
type = "animal",
|
||||||
|
@ -62,7 +50,6 @@ mcl_mobs.register_mob("mobs_mc:bat", {
|
||||||
jump = false,
|
jump = false,
|
||||||
fly = true,
|
fly = true,
|
||||||
makes_footstep_sound = false,
|
makes_footstep_sound = false,
|
||||||
spawn_check = spawn_check,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,9 +11,6 @@ local mod_target = minetest.get_modpath("mcl_target")
|
||||||
--################### BLAZE
|
--################### BLAZE
|
||||||
--###################
|
--###################
|
||||||
|
|
||||||
local function spawn_check(pos, environmental_light, artificial_light, sky_light)
|
|
||||||
return artificial_light <= 11
|
|
||||||
end
|
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:blaze", {
|
mcl_mobs.register_mob("mobs_mc:blaze", {
|
||||||
description = S("Blaze"),
|
description = S("Blaze"),
|
||||||
|
@ -140,7 +137,6 @@ mcl_mobs.register_mob("mobs_mc:blaze", {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
spawn_check = spawn_check,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
mcl_mobs:spawn_specific(
|
mcl_mobs:spawn_specific(
|
||||||
|
@ -211,6 +207,5 @@ mcl_mobs.register_arrow("mobs_mc:blaze_fireball", {
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:blaze", "overworld", 0, 11)
|
-- spawn eggs
|
||||||
-- spawn eggs.
|
|
||||||
mcl_mobs.register_egg("mobs_mc:blaze", S("Blaze"), "#f6b201", "#fff87e", 0)
|
mcl_mobs.register_egg("mobs_mc:blaze", S("Blaze"), "#f6b201", "#fff87e", 0)
|
||||||
|
|
|
@ -23,7 +23,7 @@ mcl_mobs.register_mob("mobs_mc:chicken", {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 4,
|
bone_eye_height = 4,
|
||||||
head_eye_height = 1.5,
|
head_eye_height = 1.5,
|
||||||
horizontal_head_height = -.3,
|
horrizonatal_head_height = -.3,
|
||||||
curiosity = 10,
|
curiosity = 10,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
visual_size = {x=1,y=1},
|
visual_size = {x=1,y=1},
|
||||||
|
|
|
@ -31,7 +31,7 @@ local S = minetest.get_translator(minetest.get_current_modname())
|
||||||
|
|
||||||
local cod = {
|
local cod = {
|
||||||
type = "animal",
|
type = "animal",
|
||||||
spawn_class = "water_ambient",
|
spawn_class = "water",
|
||||||
can_despawn = true,
|
can_despawn = true,
|
||||||
passive = true,
|
passive = true,
|
||||||
hp_min = 3,
|
hp_min = 3,
|
||||||
|
@ -40,14 +40,14 @@ local cod = {
|
||||||
xp_max = 3,
|
xp_max = 3,
|
||||||
armor = 100,
|
armor = 100,
|
||||||
rotate = 180,
|
rotate = 180,
|
||||||
spawn_in_group_min = 2, -- was 3
|
spawn_in_group_min = 3,
|
||||||
spawn_in_group = 4, -- was 8 nerfed until we can cap them properly locally. this is a group size, not a per spawn attempt
|
spawn_in_group = 8,
|
||||||
tilt_swim = true,
|
tilt_swim = true,
|
||||||
collisionbox = {-0.3, 0.0, -0.3, 0.3, 0.79, 0.3},
|
collisionbox = {-0.3, 0.0, -0.3, 0.3, 0.79, 0.3},
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
mesh = "extra_mobs_cod.b3d",
|
mesh = "extra_mobs_cod.b3d",
|
||||||
textures = {
|
textures = {
|
||||||
{"mobs_mc_cod.png"}
|
{"extra_mobs_cod.png"}
|
||||||
},
|
},
|
||||||
sounds = {
|
sounds = {
|
||||||
},
|
},
|
||||||
|
|
|
@ -14,7 +14,7 @@ local cow_def = {
|
||||||
xp_max = 3,
|
xp_max = 3,
|
||||||
collisionbox = {-0.45, -0.01, -0.45, 0.45, 1.39, 0.45},
|
collisionbox = {-0.45, -0.01, -0.45, 0.45, 1.39, 0.45},
|
||||||
spawn_in_group = 4,
|
spawn_in_group = 4,
|
||||||
spawn_in_group_min = 2,
|
spawn_in_group_min = 3,
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
mesh = "mobs_mc_cow.b3d",
|
mesh = "mobs_mc_cow.b3d",
|
||||||
textures = { {
|
textures = { {
|
||||||
|
@ -24,7 +24,7 @@ local cow_def = {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 10,
|
bone_eye_height = 10,
|
||||||
head_eye_height = 1.1,
|
head_eye_height = 1.1,
|
||||||
horizontal_head_height=-1.8,
|
horrizonatal_head_height=-1.8,
|
||||||
curiosity = 2,
|
curiosity = 2,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
makes_footstep_sound = true,
|
makes_footstep_sound = true,
|
||||||
|
@ -93,8 +93,8 @@ mcl_mobs.register_mob("mobs_mc:cow", cow_def)
|
||||||
-- Mooshroom
|
-- Mooshroom
|
||||||
local mooshroom_def = table.copy(cow_def)
|
local mooshroom_def = table.copy(cow_def)
|
||||||
mooshroom_def.description = S("Mooshroom")
|
mooshroom_def.description = S("Mooshroom")
|
||||||
mooshroom_def.spawn_in_group_min = 2
|
mooshroom_def.spawn_in_group_min = 4
|
||||||
mooshroom_def.spawn_in_group = 4
|
mooshroom_def.spawn_in_group = 8
|
||||||
mooshroom_def.textures = { {"mobs_mc_mooshroom.png", "mobs_mc_mushroom_red.png"}, {"mobs_mc_mooshroom_brown.png", "mobs_mc_mushroom_brown.png" } }
|
mooshroom_def.textures = { {"mobs_mc_mooshroom.png", "mobs_mc_mushroom_red.png"}, {"mobs_mc_mooshroom_brown.png", "mobs_mc_mushroom_brown.png" } }
|
||||||
mooshroom_def.on_rightclick = function(self, clicker)
|
mooshroom_def.on_rightclick = function(self, clicker)
|
||||||
if self:feed_tame(clicker, 1, true, false) then return end
|
if self:feed_tame(clicker, 1, true, false) then return end
|
||||||
|
@ -105,7 +105,7 @@ mooshroom_def.on_rightclick = function(self, clicker)
|
||||||
end
|
end
|
||||||
local item = clicker:get_wielded_item()
|
local item = clicker:get_wielded_item()
|
||||||
-- Use shears to get mushrooms and turn mooshroom into cow
|
-- Use shears to get mushrooms and turn mooshroom into cow
|
||||||
if minetest.get_item_group(item:get_name(), "shears") > 0 then
|
if item:get_name() == "mcl_tools:shears" then
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
minetest.sound_play("mcl_tools_shears_cut", {pos = pos}, true)
|
minetest.sound_play("mcl_tools_shears_cut", {pos = pos}, true)
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ local S = minetest.get_translator("mobs_mc")
|
||||||
|
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:creeper", {
|
mcl_mobs.register_mob("mobs_mc:creeper", {
|
||||||
description = S("Creeper"),
|
|
||||||
type = "monster",
|
type = "monster",
|
||||||
spawn_class = "hostile",
|
spawn_class = "hostile",
|
||||||
spawn_in_group = 1,
|
spawn_in_group = 1,
|
||||||
|
@ -24,7 +23,6 @@ mcl_mobs.register_mob("mobs_mc:creeper", {
|
||||||
mesh = "mobs_mc_creeper.b3d",
|
mesh = "mobs_mc_creeper.b3d",
|
||||||
head_swivel = "Head_Control",
|
head_swivel = "Head_Control",
|
||||||
bone_eye_height = 2.35,
|
bone_eye_height = 2.35,
|
||||||
head_eye_height = 1.8;
|
|
||||||
curiosity = 2,
|
curiosity = 2,
|
||||||
textures = {
|
textures = {
|
||||||
{"mobs_mc_creeper.png",
|
{"mobs_mc_creeper.png",
|
||||||
|
@ -41,7 +39,7 @@ mcl_mobs.register_mob("mobs_mc:creeper", {
|
||||||
},
|
},
|
||||||
makes_footstep_sound = true,
|
makes_footstep_sound = true,
|
||||||
walk_velocity = 1.05,
|
walk_velocity = 1.05,
|
||||||
run_velocity = 2.0,
|
run_velocity = 2.1,
|
||||||
runaway_from = { "mobs_mc:ocelot", "mobs_mc:cat" },
|
runaway_from = { "mobs_mc:ocelot", "mobs_mc:cat" },
|
||||||
attack_type = "explode",
|
attack_type = "explode",
|
||||||
|
|
||||||
|
@ -50,7 +48,7 @@ mcl_mobs.register_mob("mobs_mc:creeper", {
|
||||||
explosion_strength = 3,
|
explosion_strength = 3,
|
||||||
explosion_radius = 3.5,
|
explosion_radius = 3.5,
|
||||||
explosion_damage_radius = 3.5,
|
explosion_damage_radius = 3.5,
|
||||||
explosiontimer_reset_radius = 3,
|
explosiontimer_reset_radius = 6,
|
||||||
reach = 3,
|
reach = 3,
|
||||||
explosion_timer = 1.5,
|
explosion_timer = 1.5,
|
||||||
allow_fuse_reset = true,
|
allow_fuse_reset = true,
|
||||||
|
@ -172,7 +170,7 @@ mcl_mobs.register_mob("mobs_mc:creeper_charged", {
|
||||||
explosion_strength = 6,
|
explosion_strength = 6,
|
||||||
explosion_radius = 8,
|
explosion_radius = 8,
|
||||||
explosion_damage_radius = 8,
|
explosion_damage_radius = 8,
|
||||||
explosiontimer_reset_radius = 3,
|
explosiontimer_reset_radius = 6,
|
||||||
reach = 3,
|
reach = 3,
|
||||||
explosion_timer = 1.5,
|
explosion_timer = 1.5,
|
||||||
allow_fuse_reset = true,
|
allow_fuse_reset = true,
|
||||||
|
|
|
@ -42,8 +42,8 @@ local dolphin = {
|
||||||
walk_chance = 100,
|
walk_chance = 100,
|
||||||
breath_max = 120,
|
breath_max = 120,
|
||||||
rotate = 180,
|
rotate = 180,
|
||||||
spawn_in_group_min = 2, -- was 3
|
spawn_in_group_min = 3,
|
||||||
spawn_in_group = 4, -- was 4. nerfed until water has own cap, and it represents max pack size rather than per spawn attempt
|
spawn_in_group = 5,
|
||||||
tilt_swim = true,
|
tilt_swim = true,
|
||||||
collisionbox = {-0.3, 0.0, -0.3, 0.3, 0.79, 0.3},
|
collisionbox = {-0.3, 0.0, -0.3, 0.3, 0.79, 0.3},
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
|
|
|
@ -127,7 +127,7 @@ mcl_mobs.register_mob("mobs_mc:enderdragon", {
|
||||||
minetest.set_node(vector.add(self._portal_pos, vector.new(0, 5, 0)), {name = "mcl_end:dragon_egg"})
|
minetest.set_node(vector.add(self._portal_pos, vector.new(0, 5, 0)), {name = "mcl_end:dragon_egg"})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Free The End Advancement
|
-- Free The End Advancement
|
||||||
for _,players in pairs(minetest.get_objects_inside_radius(pos,64)) do
|
for _,players in pairs(minetest.get_objects_inside_radius(pos,64)) do
|
||||||
if players:is_player() then
|
if players:is_player() then
|
||||||
|
@ -136,7 +136,6 @@ mcl_mobs.register_mob("mobs_mc:enderdragon", {
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
fire_resistant = true,
|
fire_resistant = true,
|
||||||
is_boss = true,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@ -175,4 +174,3 @@ mcl_mobs.register_egg("mobs_mc:enderdragon", S("Ender Dragon"), "#252525", "#b31
|
||||||
|
|
||||||
|
|
||||||
mcl_wip.register_wip_item("mobs_mc:enderdragon")
|
mcl_wip.register_wip_item("mobs_mc:enderdragon")
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:enderdragon","overworld",0,minetest.LIGHT_MAX+1)
|
|
||||||
|
|
|
@ -24,12 +24,6 @@
|
||||||
-- added rain damage.
|
-- added rain damage.
|
||||||
-- fixed the grass_with_dirt issue.
|
-- fixed the grass_with_dirt issue.
|
||||||
|
|
||||||
-- How freqeuntly to take and place blocks, in seconds
|
|
||||||
local take_frequency_min = 235
|
|
||||||
local take_frequency_max = 245
|
|
||||||
local place_frequency_min = 235
|
|
||||||
local place_frequency_max = 245
|
|
||||||
|
|
||||||
minetest.register_entity("mobs_mc:ender_eyes", {
|
minetest.register_entity("mobs_mc:ender_eyes", {
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
mesh = "mobs_mc_spider.b3d",
|
mesh = "mobs_mc_spider.b3d",
|
||||||
|
@ -66,6 +60,13 @@ end
|
||||||
|
|
||||||
local pr = PseudoRandom(os.time()*(-334))
|
local pr = PseudoRandom(os.time()*(-334))
|
||||||
|
|
||||||
|
-- How freqeuntly to take and place blocks, in seconds
|
||||||
|
local take_frequency_min = 235
|
||||||
|
local take_frequency_max = 245
|
||||||
|
local place_frequency_min = 235
|
||||||
|
local place_frequency_max = 245
|
||||||
|
|
||||||
|
|
||||||
-- Texuture overrides for enderman block. Required for cactus because it's original is a nodebox
|
-- Texuture overrides for enderman block. Required for cactus because it's original is a nodebox
|
||||||
-- and the textures have tranparent pixels.
|
-- and the textures have tranparent pixels.
|
||||||
local block_texture_overrides
|
local block_texture_overrides
|
||||||
|
@ -344,8 +345,7 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
|
||||||
self:teleport(nil)
|
self:teleport(nil)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
else return end
|
||||||
|
|
||||||
-- AGRESSIVELY WARP/CHASE PLAYER BEHAVIOUR HERE.
|
-- AGRESSIVELY WARP/CHASE PLAYER BEHAVIOUR HERE.
|
||||||
if self.state == "attack" then
|
if self.state == "attack" then
|
||||||
if self.attack then
|
if self.attack then
|
||||||
|
@ -358,11 +358,9 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else --if not attacking try to tp to the dark
|
else --if not attacking try to tp to the dark
|
||||||
if dim == 'overworld' then
|
local light = minetest.get_node_light(enderpos)
|
||||||
local light = minetest.get_node_light(enderpos)
|
if light and light > minetest.LIGHT_MAX then
|
||||||
if light and light > minetest.LIGHT_MAX then
|
self:teleport(nil)
|
||||||
self:teleport(nil)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- ARROW / DAYTIME PEOPLE AVOIDANCE BEHAVIOUR HERE.
|
-- ARROW / DAYTIME PEOPLE AVOIDANCE BEHAVIOUR HERE.
|
||||||
|
@ -389,7 +387,6 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- PROVOKED BEHAVIOUR HERE.
|
-- PROVOKED BEHAVIOUR HERE.
|
||||||
local enderpos = self.object:get_pos()
|
local enderpos = self.object:get_pos()
|
||||||
if self.provoked == "broke_contact" then
|
if self.provoked == "broke_contact" then
|
||||||
|
@ -447,22 +444,6 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- ATTACK ENDERMITE
|
|
||||||
local enderpos = self.object:get_pos()
|
|
||||||
if math.random(1,140) == 1 then
|
|
||||||
local mobsnear = minetest.get_objects_inside_radius(enderpos, 64)
|
|
||||||
for n=1, #mobsnear do
|
|
||||||
local mob = mobsnear[n]
|
|
||||||
if mob then
|
|
||||||
local entity = mob:get_luaentity()
|
|
||||||
if entity and entity.name == "mobs_mc:endermite" then
|
|
||||||
self.attack = mob
|
|
||||||
self.state = 'attack'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- TAKE AND PLACE STUFF BEHAVIOUR BELOW.
|
-- TAKE AND PLACE STUFF BEHAVIOUR BELOW.
|
||||||
if not mobs_griefing then
|
if not mobs_griefing then
|
||||||
return
|
return
|
||||||
|
@ -490,7 +471,7 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
|
||||||
local dug = minetest.get_node_or_nil(take_pos)
|
local dug = minetest.get_node_or_nil(take_pos)
|
||||||
if dug and dug.name == "air" then
|
if dug and dug.name == "air" then
|
||||||
self._taken_node = node.name
|
self._taken_node = node.name
|
||||||
self.persistent = true
|
self.can_despawn = false
|
||||||
local def = minetest.registered_nodes[self._taken_node]
|
local def = minetest.registered_nodes[self._taken_node]
|
||||||
-- Update animation and texture accordingly (adds visibly carried block)
|
-- Update animation and texture accordingly (adds visibly carried block)
|
||||||
local block_type
|
local block_type
|
||||||
|
@ -541,7 +522,7 @@ mcl_mobs.register_mob("mobs_mc:enderman", {
|
||||||
if success then
|
if success then
|
||||||
local def = minetest.registered_nodes[self._taken_node]
|
local def = minetest.registered_nodes[self._taken_node]
|
||||||
-- Update animation accordingly (removes visible block)
|
-- Update animation accordingly (removes visible block)
|
||||||
self.persistent = false
|
self.can_despawn = true
|
||||||
self.animation = select_enderman_animation("normal")
|
self.animation = select_enderman_animation("normal")
|
||||||
self:set_animation(self.animation.current)
|
self:set_animation(self.animation.current)
|
||||||
if def.sounds and def.sounds.place then
|
if def.sounds and def.sounds.place then
|
||||||
|
|
|
@ -39,4 +39,3 @@ mcl_mobs.register_mob("mobs_mc:endermite", {
|
||||||
})
|
})
|
||||||
|
|
||||||
mcl_mobs.register_egg("mobs_mc:endermite", S("Endermite"), "#161616", "#6d6d6d", 0)
|
mcl_mobs.register_egg("mobs_mc:endermite", S("Endermite"), "#161616", "#6d6d6d", 0)
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:endermite","overworld",0,7)
|
|
||||||
|
|
|
@ -139,6 +139,6 @@ mcl_mobs.register_arrow("mobs_mc:fireball", {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:ghast","overworld","0","7")
|
|
||||||
-- spawn eggs
|
-- spawn eggs
|
||||||
mcl_mobs.register_egg("mobs_mc:ghast", S("Ghast"), "#f9f9f9", "#bcbcbc", 0)
|
mcl_mobs.register_egg("mobs_mc:ghast", S("Ghast"), "#f9f9f9", "#bcbcbc", 0)
|
||||||
|
|
|
@ -25,13 +25,13 @@ local base_psdef = {
|
||||||
local psdefs = {}
|
local psdefs = {}
|
||||||
for i=1,4 do
|
for i=1,4 do
|
||||||
local p = table.copy(base_psdef)
|
local p = table.copy(base_psdef)
|
||||||
p.texture = "mobs_mc_glow_squid_glint"..i..".png"
|
p.texture = "extra_mobs_glow_squid_glint"..i..".png"
|
||||||
table.insert(psdefs,p)
|
table.insert(psdefs,p)
|
||||||
end
|
end
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:glow_squid", {
|
mcl_mobs.register_mob("mobs_mc:glow_squid", {
|
||||||
type = "animal",
|
type = "animal",
|
||||||
spawn_class = "water_underground",
|
spawn_class = "water",
|
||||||
can_despawn = true,
|
can_despawn = true,
|
||||||
passive = true,
|
passive = true,
|
||||||
hp_min = 10,
|
hp_min = 10,
|
||||||
|
@ -47,7 +47,7 @@ mcl_mobs.register_mob("mobs_mc:glow_squid", {
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
mesh = "extra_mobs_glow_squid.b3d",
|
mesh = "extra_mobs_glow_squid.b3d",
|
||||||
textures = {
|
textures = {
|
||||||
{ "mobs_mc_glow_squid.png" }
|
{ "extra_mobs_glow_squid.png" }
|
||||||
},
|
},
|
||||||
sounds = {
|
sounds = {
|
||||||
damage = { name = "mobs_mc_squid_hurt", gain = 0.3 },
|
damage = { name = "mobs_mc_squid_hurt", gain = 0.3 },
|
||||||
|
|
|
@ -102,6 +102,6 @@ mcl_mobs.register_mob("mobs_mc:guardian", {
|
||||||
-- Spawning disabled due to size issues
|
-- Spawning disabled due to size issues
|
||||||
-- TODO: Re-enable spawning
|
-- TODO: Re-enable spawning
|
||||||
--mcl_mobs:spawn_specific("mobs_mc:guardian", { "mcl_core:water_source", "mclx_core:river_water_source" }, { "mcl_core:water_source", "mclx_core:river_water_source" }, 0, minetest.LIGHT_MAX+1, 30, 25000, 2, mcl_vars.mg_overworld_min, mobs_mc.water_level - 10)
|
--mcl_mobs:spawn_specific("mobs_mc:guardian", { "mcl_core:water_source", "mclx_core:river_water_source" }, { "mcl_core:water_source", "mclx_core:river_water_source" }, 0, minetest.LIGHT_MAX+1, 30, 25000, 2, mcl_vars.mg_overworld_min, mobs_mc.water_level - 10)
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:guardian","overworld",0,minetest.LIGHT_MAX+1)
|
|
||||||
-- spawn eggs
|
-- spawn eggs
|
||||||
mcl_mobs.register_egg("mobs_mc:guardian", S("Guardian"), "#5a8272", "#f17d31", 0)
|
mcl_mobs.register_egg("mobs_mc:guardian", S("Guardian"), "#5a8272", "#f17d31", 0)
|
||||||
|
|
|
@ -113,4 +113,5 @@ mcl_mobs.register_mob("mobs_mc:guardian_elder", {
|
||||||
|
|
||||||
-- spawn eggs
|
-- spawn eggs
|
||||||
mcl_mobs.register_egg("mobs_mc:guardian_elder", S("Elder Guardian"), "#ceccba", "#747693", 0)
|
mcl_mobs.register_egg("mobs_mc:guardian_elder", S("Elder Guardian"), "#ceccba", "#747693", 0)
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:guardian_elder","overworld",0,minetest.LIGHT_MAX+1)
|
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ local S = minetest.get_translator("mobs_mc")
|
||||||
--###################
|
--###################
|
||||||
|
|
||||||
local hoglin = {
|
local hoglin = {
|
||||||
description = S("Hoglin"),
|
|
||||||
type = "monster",
|
type = "monster",
|
||||||
passive = false,
|
passive = false,
|
||||||
spawn_class = "hostile",
|
spawn_class = "hostile",
|
||||||
|
@ -20,9 +19,8 @@ local hoglin = {
|
||||||
xp_max = 9,
|
xp_max = 9,
|
||||||
armor = {fleshy = 90},
|
armor = {fleshy = 90},
|
||||||
attack_type = "dogfight",
|
attack_type = "dogfight",
|
||||||
attack_frequency = 3;
|
|
||||||
damage = 4,
|
damage = 4,
|
||||||
reach = 1.9,
|
reach = 3,
|
||||||
collisionbox = {-.6, -0.01, -.6, .6, 1.4, .6},
|
collisionbox = {-.6, -0.01, -.6, .6, 1.4, .6},
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
mesh = "extra_mobs_hoglin.b3d",
|
mesh = "extra_mobs_hoglin.b3d",
|
||||||
|
@ -38,7 +36,7 @@ local hoglin = {
|
||||||
jump = true,
|
jump = true,
|
||||||
makes_footstep_sound = true,
|
makes_footstep_sound = true,
|
||||||
walk_velocity = 1,
|
walk_velocity = 1,
|
||||||
run_velocity = 2.8,
|
run_velocity = 4,
|
||||||
drops = {
|
drops = {
|
||||||
{name = "mobs_mcitems:leather",
|
{name = "mobs_mcitems:leather",
|
||||||
chance = 1,
|
chance = 1,
|
||||||
|
@ -65,7 +63,7 @@ local hoglin = {
|
||||||
punch_end = 32,
|
punch_end = 32,
|
||||||
},
|
},
|
||||||
fear_height = 4,
|
fear_height = 4,
|
||||||
view_range = 16,
|
view_range = 32,
|
||||||
floats = 0,
|
floats = 0,
|
||||||
custom_attack = function(self)
|
custom_attack = function(self)
|
||||||
if self.state == "attack" and self.reach > vector.distance(self.object:get_pos(), self.attack:get_pos()) then
|
if self.state == "attack" and self.reach > vector.distance(self.object:get_pos(), self.attack:get_pos()) then
|
||||||
|
@ -89,7 +87,6 @@ local hoglin = {
|
||||||
mcl_mobs.register_mob("mobs_mc:hoglin", hoglin)
|
mcl_mobs.register_mob("mobs_mc:hoglin", hoglin)
|
||||||
|
|
||||||
local zoglin = table.copy(hoglin)
|
local zoglin = table.copy(hoglin)
|
||||||
zoglin.description = S("Zoglin")
|
|
||||||
zoglin.fire_resistant = 1
|
zoglin.fire_resistant = 1
|
||||||
zoglin.textures = {"extra_mobs_zoglin.png"}
|
zoglin.textures = {"extra_mobs_zoglin.png"}
|
||||||
zoglin.do_custom = function()
|
zoglin.do_custom = function()
|
||||||
|
@ -103,7 +100,6 @@ mcl_mobs.register_mob("mobs_mc:zoglin", zoglin)
|
||||||
-- Baby hoglin.
|
-- Baby hoglin.
|
||||||
|
|
||||||
local baby_hoglin = table.copy(hoglin)
|
local baby_hoglin = table.copy(hoglin)
|
||||||
baby_hoglin.description = S("Baby hoglin")
|
|
||||||
baby_hoglin.collisionbox = {-.3, -0.01, -.3, .3, 0.94, .3}
|
baby_hoglin.collisionbox = {-.3, -0.01, -.3, .3, 0.94, .3}
|
||||||
baby_hoglin.xp_min = 20
|
baby_hoglin.xp_min = 20
|
||||||
baby_hoglin.xp_max = 20
|
baby_hoglin.xp_max = 20
|
||||||
|
@ -124,6 +120,7 @@ mcl_mobs:spawn_specific(
|
||||||
"nether",
|
"nether",
|
||||||
"ground",
|
"ground",
|
||||||
{
|
{
|
||||||
|
"Nether",
|
||||||
"CrimsonForest"
|
"CrimsonForest"
|
||||||
},
|
},
|
||||||
0,
|
0,
|
||||||
|
@ -134,7 +131,5 @@ minetest.LIGHT_MAX+1,
|
||||||
mcl_vars.mg_nether_min,
|
mcl_vars.mg_nether_min,
|
||||||
mcl_vars.mg_nether_max)
|
mcl_vars.mg_nether_max)
|
||||||
|
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:hoglin","overworld",0,7)
|
|
||||||
|
|
||||||
-- spawn eggs
|
-- spawn eggs
|
||||||
mcl_mobs.register_egg("mobs_mc:hoglin", S("Hoglin"), "#85682e", "#2b2140", 0)
|
mcl_mobs.register_egg("mobs_mc:hoglin", S("Hoglin"), "#85682e", "#2b2140", 0)
|
||||||
|
|
|
@ -125,7 +125,7 @@ local horse = {
|
||||||
type = "animal",
|
type = "animal",
|
||||||
spawn_class = "passive",
|
spawn_class = "passive",
|
||||||
spawn_in_group_min = 2,
|
spawn_in_group_min = 2,
|
||||||
spawn_in_group = 4, -- was 6. nerfed until group size is a cap rather than per spawn cycle
|
spawn_in_group = 6,
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
mesh = "mobs_mc_horse.b3d",
|
mesh = "mobs_mc_horse.b3d",
|
||||||
visual_size = {x=3.0, y=3.0},
|
visual_size = {x=3.0, y=3.0},
|
||||||
|
@ -646,5 +646,3 @@ mcl_mobs.register_egg("mobs_mc:skeleton_horse", S("Skeleton Horse"), "#68684f",
|
||||||
--mobs:register_egg("mobs_mc:zombie_horse", S("Zombie Horse"), "#2a5a37", "#84d080", 0)
|
--mobs:register_egg("mobs_mc:zombie_horse", S("Zombie Horse"), "#2a5a37", "#84d080", 0)
|
||||||
mcl_mobs.register_egg("mobs_mc:donkey", S("Donkey"), "#534539", "#867566", 0)
|
mcl_mobs.register_egg("mobs_mc:donkey", S("Donkey"), "#534539", "#867566", 0)
|
||||||
mcl_mobs.register_egg("mobs_mc:mule", S("Mule"), "#1b0200", "#51331d", 0)
|
mcl_mobs.register_egg("mobs_mc:mule", S("Mule"), "#1b0200", "#51331d", 0)
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:mule","overworld",9,minetest.LIGHT_MAX+1)
|
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:skeleton_horse","overworld",9,minetest.LIGHT_MAX+1)
|
|
||||||
|
|
|
@ -139,6 +139,7 @@ dofile(path .. "/silverfish.lua") -- maikerumine Mesh and animation by toby109tt
|
||||||
dofile(path .. "/skeleton+stray.lua") -- Mesh by Morn76 Animation by Pavel_S
|
dofile(path .. "/skeleton+stray.lua") -- Mesh by Morn76 Animation by Pavel_S
|
||||||
dofile(path .. "/skeleton_wither.lua") -- Mesh by Morn76 Animation by Pavel_S
|
dofile(path .. "/skeleton_wither.lua") -- Mesh by Morn76 Animation by Pavel_S
|
||||||
dofile(path .. "/zombie.lua") -- Mesh by Morn76 Animation by Pavel_S
|
dofile(path .. "/zombie.lua") -- Mesh by Morn76 Animation by Pavel_S
|
||||||
|
dofile(path .. "/zombiepig.lua") -- Mesh by Morn76 Animation by Pavel_S
|
||||||
dofile(path .. "/slime+magma_cube.lua") -- Wuzzy
|
dofile(path .. "/slime+magma_cube.lua") -- Wuzzy
|
||||||
dofile(path .. "/spider.lua") -- Spider by AspireMint (fishyWET (CC-BY-SA 3.0 license for texture)
|
dofile(path .. "/spider.lua") -- Spider by AspireMint (fishyWET (CC-BY-SA 3.0 license for texture)
|
||||||
dofile(path .. "/vex.lua") -- KrupnoPavel
|
dofile(path .. "/vex.lua") -- KrupnoPavel
|
||||||
|
@ -152,7 +153,7 @@ dofile(path .. "/dolphin.lua")
|
||||||
|
|
||||||
dofile(path .. "/glow_squid.lua")
|
dofile(path .. "/glow_squid.lua")
|
||||||
|
|
||||||
dofile(path .. "/piglin.lua") -- "mobs_mc_zombie_pigman.b3d" Mesh by Morn76 Animation by Pavel_S
|
dofile(path .. "/piglin.lua")
|
||||||
dofile(path .. "/hoglin+zoglin.lua")
|
dofile(path .. "/hoglin+zoglin.lua")
|
||||||
|
|
||||||
dofile(path .. "/strider.lua")
|
dofile(path .. "/strider.lua")
|
||||||
|
|
|
@ -4,14 +4,12 @@
|
||||||
--License for code WTFPL and otherwise stated in readmes
|
--License for code WTFPL and otherwise stated in readmes
|
||||||
|
|
||||||
local S = minetest.get_translator("mobs_mc")
|
local S = minetest.get_translator("mobs_mc")
|
||||||
local allow_nav_hacks = minetest.settings:get_bool("mcl_mob_allow_nav_hacks ",false)
|
|
||||||
|
|
||||||
--###################
|
--###################
|
||||||
--################### IRON GOLEM
|
--################### IRON GOLEM
|
||||||
--###################
|
--###################
|
||||||
|
|
||||||
local walk_dist = 40
|
local etime = 0
|
||||||
local tele_dist = 80
|
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:iron_golem", {
|
mcl_mobs.register_mob("mobs_mc:iron_golem", {
|
||||||
description = S("Iron Golem"),
|
description = S("Iron Golem"),
|
||||||
|
@ -87,23 +85,11 @@ mcl_mobs.register_mob("mobs_mc:iron_golem", {
|
||||||
punch_start = 40, punch_end = 50,
|
punch_start = 40, punch_end = 50,
|
||||||
},
|
},
|
||||||
jump = true,
|
jump = true,
|
||||||
do_custom = function(self, dtime)
|
on_step = function(self,dtime)
|
||||||
self.home_timer = (self.home_timer or 0) + dtime
|
etime = etime + dtime
|
||||||
|
if etime > 10 then
|
||||||
if self.home_timer > 10 then
|
if self._home and vector.distance(self._home,self.object:get_pos()) > 50 then
|
||||||
self.home_timer = 0
|
self:gopath(self._home)
|
||||||
if self._home and self.state ~= "attack" then
|
|
||||||
local dist = vector.distance(self._home,self.object:get_pos())
|
|
||||||
if allow_nav_hacks and dist >= tele_dist then
|
|
||||||
self.object:set_pos(self._home)
|
|
||||||
self.state = "stand"
|
|
||||||
self.order = "follow"
|
|
||||||
elseif dist >= walk_dist then
|
|
||||||
self:gopath(self._home, function(self)
|
|
||||||
self.state = "stand"
|
|
||||||
self.order = "follow"
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
@ -220,4 +206,3 @@ function mobs_mc.check_iron_golem_summon(pos)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:iron_golem","overworld",0,minetest.LIGHT_MAX+1)
|
|
||||||
|
|
|
@ -56,13 +56,13 @@ mcl_mobs.register_mob("mobs_mc:llama", {
|
||||||
shoot_interval = 5.5,
|
shoot_interval = 5.5,
|
||||||
arrow = "mobs_mc:llamaspit",
|
arrow = "mobs_mc:llamaspit",
|
||||||
shoot_offset = 1, --3.5 *would* be a good value visually but it somehow messes with the projectiles trajectory
|
shoot_offset = 1, --3.5 *would* be a good value visually but it somehow messes with the projectiles trajectory
|
||||||
spawn_in_group_min = 2, -- was 4
|
spawn_in_group_min = 4,
|
||||||
spawn_in_group = 4, -- was 6 nerfed until we can cap them properly locally. this is a group size, not a per spawn attempt
|
spawn_in_group = 6,
|
||||||
|
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 11,
|
bone_eye_height = 11,
|
||||||
head_eye_height = 3,
|
head_eye_height = 3,
|
||||||
horizontal_head_height=0,
|
horrizonatal_head_height=0,
|
||||||
curiosity = 60,
|
curiosity = 60,
|
||||||
head_yaw = "z",
|
head_yaw = "z",
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ Wither=Wither
|
||||||
Wolf=Wolf
|
Wolf=Wolf
|
||||||
Husk=Wüstenzombie
|
Husk=Wüstenzombie
|
||||||
Zombie=Zombie
|
Zombie=Zombie
|
||||||
Zombie Piglin=Schweinezombie
|
Zombie Pigman=Schweinezombie
|
||||||
Farmer=Bauer
|
Farmer=Bauer
|
||||||
Fisherman=Fischer
|
Fisherman=Fischer
|
||||||
Fletcher=Pfeilmacher
|
Fletcher=Pfeilmacher
|
||||||
|
|
|
@ -1,70 +0,0 @@
|
||||||
# textdomain: mobs_mc
|
|
||||||
Agent=Agent
|
|
||||||
Axolotl=Salamander
|
|
||||||
Bat=Flagermus
|
|
||||||
Blaze=Blaze
|
|
||||||
Chicken=Kylling
|
|
||||||
Cow=Ko
|
|
||||||
Mooshroom=Svamp
|
|
||||||
Creeper=Creeper
|
|
||||||
Ender Dragon=Enderdrage
|
|
||||||
Enderman=Enderman
|
|
||||||
Endermite=Endermide
|
|
||||||
Ghast=Ghast
|
|
||||||
Elder Guardian=Gammel beskytter
|
|
||||||
Guardian=Beskytter
|
|
||||||
Horse=Hest
|
|
||||||
Skeleton Horse=Skelethest
|
|
||||||
Zombie Horse=Zombiehest
|
|
||||||
Donkey=Æsel
|
|
||||||
Mule=Muldyr
|
|
||||||
Iron Golem=Jerngolem
|
|
||||||
Llama=Lama
|
|
||||||
Ocelot=Ozelot
|
|
||||||
Parrot=Papegøje
|
|
||||||
Pig=Gris
|
|
||||||
Polar Bear=Isbjørn
|
|
||||||
Rabbit=Kanin
|
|
||||||
Killer Bunny=Dræberkanin
|
|
||||||
Sheep=Får
|
|
||||||
Shulker=Shulker
|
|
||||||
Silverfish=Sølvfisk
|
|
||||||
Skeleton=Skelet
|
|
||||||
Stray=Omstrejfer
|
|
||||||
Wither Skeleton=Wither-skelet
|
|
||||||
Magma Cube=Magmakube
|
|
||||||
Slime=Slimklump
|
|
||||||
Snow Golem=Snegolem
|
|
||||||
Spider=Edderkop
|
|
||||||
Cave Spider=Huleedderkop
|
|
||||||
Squid=Blæksprutte
|
|
||||||
Vex=Vex
|
|
||||||
Evoker=Fremkalder
|
|
||||||
Illusioner=Illusionist
|
|
||||||
Villager=Landsbyboer
|
|
||||||
Vindicator=Hævner
|
|
||||||
Zombie Villager=Zombie landsbyboer
|
|
||||||
Witch=Heks
|
|
||||||
Wither=Wither
|
|
||||||
Wolf=Ulv
|
|
||||||
Husk=Udtørretskal
|
|
||||||
Zombie=Zombie
|
|
||||||
Zombie Pigman=Zombificeret piglin
|
|
||||||
Farmer=Landmand
|
|
||||||
Fisherman=Fisker
|
|
||||||
Fletcher=Pilemager
|
|
||||||
Shepherd=Fårehyrde
|
|
||||||
Librarian=Bibliotikar
|
|
||||||
Cartographer=Kartograf
|
|
||||||
Armorer=Rustningesmed
|
|
||||||
Leatherworker=Læderarbejder
|
|
||||||
Butcher=Slagter
|
|
||||||
Weapon Smith=Våbensmed
|
|
||||||
Tool Smith=Værktøjssmed
|
|
||||||
Cleric=Gejstlig
|
|
||||||
Nitwit=Tåbe
|
|
||||||
Cod=Torsk
|
|
||||||
Salmon=Laks
|
|
||||||
Dolphin=Delfin
|
|
||||||
Pillager=Plyndrer
|
|
||||||
Tropical fish=Tropisk fisk
|
|
|
@ -54,21 +54,5 @@ Baby Husk=Bebé Zombi Momificado
|
||||||
Baby Zombie=Bebé Zombi
|
Baby Zombie=Bebé Zombi
|
||||||
Husk=Zombi Momificado
|
Husk=Zombi Momificado
|
||||||
Zombie=Zombi
|
Zombie=Zombi
|
||||||
Baby Zombie Piglin=Bebé Hombrecerdo Zombi
|
Baby Zombie Pigman=Bebé Hombrecerdo Zombi
|
||||||
Zombie Piglin=Hombrecerdo Zombi
|
Zombie Pigman=Hombrecerdo Zombi
|
||||||
Cartographer=Cartógrafo
|
|
||||||
Armorer=Escudero
|
|
||||||
Leatherworker=Peletero
|
|
||||||
Butcher=Carnicero
|
|
||||||
Weapon Smith=Armero
|
|
||||||
Tool Smith=Herrero
|
|
||||||
Cleric=Clérigo
|
|
||||||
Nitwit=Holgazán
|
|
||||||
Cod=Bacalao
|
|
||||||
Salmon=Salmón
|
|
||||||
Dolphin=Delfín
|
|
||||||
Pillager=Saqueador
|
|
||||||
Tropical fish=Pez tropical
|
|
||||||
Hoglin=Hoglin
|
|
||||||
Strider=Lavagante
|
|
||||||
Glow Squid=Calamar luminoso
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
# textdomain: mobs_mc
|
# textdomain: mobs_mc
|
||||||
Agent=Agent
|
Agent=Agent
|
||||||
Axolotl=Axolotl
|
|
||||||
Bat=Chauve-souris
|
Bat=Chauve-souris
|
||||||
Blaze=Blaze
|
Blaze=Blaze
|
||||||
Chicken=Poulet
|
Chicken=Poulet
|
||||||
|
@ -21,7 +20,6 @@ Mule=Mule
|
||||||
Iron Golem=Golem de fer
|
Iron Golem=Golem de fer
|
||||||
Llama=Lama
|
Llama=Lama
|
||||||
Ocelot=Ocelot
|
Ocelot=Ocelot
|
||||||
Cat=Chat
|
|
||||||
Parrot=Perroquet
|
Parrot=Perroquet
|
||||||
Pig=Cochon
|
Pig=Cochon
|
||||||
Polar Bear=Ours blanc
|
Polar Bear=Ours blanc
|
||||||
|
@ -49,15 +47,8 @@ Witch=Sorcière
|
||||||
Wither=Wither
|
Wither=Wither
|
||||||
Wolf=Loup
|
Wolf=Loup
|
||||||
Husk=Zombie Momifié
|
Husk=Zombie Momifié
|
||||||
Baby Husk=Bébé Zombie Momifié
|
|
||||||
Zombie=Zombie
|
Zombie=Zombie
|
||||||
Baby Zombie=Bébé Zombie
|
Zombie Pigman=Zombie Cochon
|
||||||
Piglin=Piglin
|
|
||||||
Baby Piglin=Bébé Piglin
|
|
||||||
Zombie Piglin=Piglin Zombie
|
|
||||||
Baby Zombie Piglin=Bébé Piglin Zombie
|
|
||||||
Sword Piglin=Piglin avec une épée
|
|
||||||
Piglin Brute=Piglin Barbare
|
|
||||||
Farmer=Fermier
|
Farmer=Fermier
|
||||||
Fisherman=Pêcheur
|
Fisherman=Pêcheur
|
||||||
Fletcher=Archer
|
Fletcher=Archer
|
||||||
|
@ -75,9 +66,4 @@ Cod=Morue
|
||||||
Salmon=Saumon
|
Salmon=Saumon
|
||||||
Dolphin=Dauphin
|
Dolphin=Dauphin
|
||||||
Pillager=Pilleur
|
Pillager=Pilleur
|
||||||
Tropical fish=Poisson tropical
|
Tropical fish=Poisson tropical
|
||||||
Hoglin=Hoglin
|
|
||||||
Baby hoglin=Bébé Hoglin
|
|
||||||
Zoglin=Zoglin
|
|
||||||
Strider=Arpenteur
|
|
||||||
Glow Squid=Poulpe Brillant
|
|
|
@ -49,7 +49,7 @@ Wither=ウィザー
|
||||||
Wolf=オオカミ
|
Wolf=オオカミ
|
||||||
Husk=ハスク
|
Husk=ハスク
|
||||||
Zombie=ゾンビ
|
Zombie=ゾンビ
|
||||||
Zombie Piglin=ゾンビピッグマン
|
Zombie Pigman=ゾンビピッグマン
|
||||||
Farmer=農民
|
Farmer=農民
|
||||||
Fisherman=漁師
|
Fisherman=漁師
|
||||||
Fletcher=矢師
|
Fletcher=矢師
|
||||||
|
|
|
@ -1,27 +1,25 @@
|
||||||
# textdomain: mobs_mc
|
# textdomain: mobs_mc
|
||||||
Agent=Агент
|
Agent=Агент
|
||||||
Axolotl=Аксолотль
|
|
||||||
Bat=Летучая мышь
|
Bat=Летучая мышь
|
||||||
Blaze=Ифрит
|
Blaze=Ифрит
|
||||||
Chicken=Курица
|
Chicken=Курица
|
||||||
Cow=Корова
|
Cow=Корова
|
||||||
Mooshroom=Грибная корова
|
Mooshroom=Гриб
|
||||||
Creeper=Крипер
|
Creeper=Крипер
|
||||||
Ender Dragon=Дракон Края
|
Ender Dragon=Дракон Предела
|
||||||
Enderman=Эндермен
|
Enderman=Эндермен
|
||||||
Endermite=Эндермит
|
Endermite=Эндермит
|
||||||
Ghast=Гаст
|
Ghast=Гаст
|
||||||
Elder Guardian=Древний страж
|
Elder Guardian=Древний страж
|
||||||
Guardian=Страж
|
Guardian=Страж
|
||||||
Horse=Лошадь
|
Horse=Лошадь
|
||||||
Skeleton Horse=Лошадь-скелет
|
Skeleton Horse=Скелет лошади
|
||||||
Zombie Horse=Лошадь-зомби
|
Zombie Horse=Зомби-лошадь
|
||||||
Donkey=Ослик
|
Donkey=Ослик
|
||||||
Mule=Мул
|
Mule=Мул
|
||||||
Iron Golem=Железный голем
|
Iron Golem=Железный голем
|
||||||
Llama=Лама
|
Llama=Лама
|
||||||
Ocelot=Оцелот
|
Ocelot=Оцелот
|
||||||
Cat=Кошка
|
|
||||||
Parrot=Попугай
|
Parrot=Попугай
|
||||||
Pig=Свинья
|
Pig=Свинья
|
||||||
Polar Bear=Полярный медведь
|
Polar Bear=Полярный медведь
|
||||||
|
@ -34,13 +32,13 @@ Skeleton=Скелет
|
||||||
Stray=Странник
|
Stray=Странник
|
||||||
Wither Skeleton=Скелет-иссушитель
|
Wither Skeleton=Скелет-иссушитель
|
||||||
Magma Cube=Лавовый куб
|
Magma Cube=Лавовый куб
|
||||||
Slime=Слизень
|
Slime=Слизняк
|
||||||
Snow Golem=Снежный голем
|
Snow Golem=Снежный голем
|
||||||
Spider=Паук
|
Spider=Паук
|
||||||
Cave Spider=Пещерный паук
|
Cave Spider=Пещерный паук
|
||||||
Squid=Спрут
|
Squid=Кальмар
|
||||||
Vex=Досаждатель
|
Vex=Досаждатель
|
||||||
Evoker=Вызыватель
|
Evoker=Маг
|
||||||
Illusioner=Иллюзор
|
Illusioner=Иллюзор
|
||||||
Villager=Житель
|
Villager=Житель
|
||||||
Vindicator=Поборник
|
Vindicator=Поборник
|
||||||
|
@ -49,15 +47,8 @@ Witch=Ведьма
|
||||||
Wither=Иссушитель
|
Wither=Иссушитель
|
||||||
Wolf=Волк
|
Wolf=Волк
|
||||||
Husk=Кадавр
|
Husk=Кадавр
|
||||||
Baby Husk=Кадавр-ребёнок
|
|
||||||
Zombie=Зомби
|
Zombie=Зомби
|
||||||
Baby Zombie=Зомби-ребёнок
|
Zombie Pigman=Зомби-свиночеловек
|
||||||
Piglin=Пиглин
|
|
||||||
Baby Piglin=Пиглин-ребёнок
|
|
||||||
Zombie Piglin=Зомби-пиглин
|
|
||||||
Baby Zombie Piglin=Зомби-пиглин-ребёнок
|
|
||||||
Sword Piglin=Пиглин-мечник
|
|
||||||
Piglin Brute=Жестокий пиглин
|
|
||||||
Farmer=Фермер
|
Farmer=Фермер
|
||||||
Fisherman=Рыбак
|
Fisherman=Рыбак
|
||||||
Fletcher=Лучник
|
Fletcher=Лучник
|
||||||
|
@ -71,13 +62,3 @@ Weapon Smith=Оружейник
|
||||||
Tool Smith=Инструментальщик
|
Tool Smith=Инструментальщик
|
||||||
Cleric=Церковник
|
Cleric=Церковник
|
||||||
Nitwit=Нищий
|
Nitwit=Нищий
|
||||||
Cod=Треска
|
|
||||||
Salmon=Лосось
|
|
||||||
Dolphin=Дельфин
|
|
||||||
Pillager=Разбойник
|
|
||||||
Tropical fish=Тропическая рыба
|
|
||||||
Hoglin=Хоглин
|
|
||||||
Baby hoglin=Детёныш хоглина
|
|
||||||
Zoglin=Зоглин
|
|
||||||
Strider=Страйдер
|
|
||||||
Glow Squid=Светящийся спрут
|
|
||||||
|
|
|
@ -21,7 +21,6 @@ Mule=
|
||||||
Iron Golem=
|
Iron Golem=
|
||||||
Llama=
|
Llama=
|
||||||
Ocelot=
|
Ocelot=
|
||||||
Cat=
|
|
||||||
Parrot=
|
Parrot=
|
||||||
Pig=
|
Pig=
|
||||||
Polar Bear=
|
Polar Bear=
|
||||||
|
@ -49,15 +48,8 @@ Witch=
|
||||||
Wither=
|
Wither=
|
||||||
Wolf=
|
Wolf=
|
||||||
Husk=
|
Husk=
|
||||||
Baby Husk=
|
|
||||||
Zombie=
|
Zombie=
|
||||||
Baby Zombie=
|
Zombie Pigman=
|
||||||
Piglin=
|
|
||||||
Baby Piglin=
|
|
||||||
Zombie Piglin=
|
|
||||||
Baby Zombie Piglin=
|
|
||||||
Sword Piglin=
|
|
||||||
Piglin Brute=
|
|
||||||
Farmer=
|
Farmer=
|
||||||
Fisherman=
|
Fisherman=
|
||||||
Fletcher=
|
Fletcher=
|
||||||
|
@ -75,9 +67,4 @@ Cod=
|
||||||
Salmon=
|
Salmon=
|
||||||
Dolphin=
|
Dolphin=
|
||||||
Pillager=
|
Pillager=
|
||||||
Tropical fish=
|
Tropical fish=
|
||||||
Hoglin=
|
|
||||||
Baby hoglin=
|
|
||||||
Zoglin=
|
|
||||||
Strider=
|
|
||||||
Glow Squid=
|
|
|
@ -2,4 +2,4 @@ name = mobs_mc
|
||||||
author = maikerumine
|
author = maikerumine
|
||||||
description = Adds Minecraft-like monsters and animals.
|
description = Adds Minecraft-like monsters and animals.
|
||||||
depends = mcl_init, mcl_particles, mcl_mobs, mcl_wip, mcl_core, mcl_util
|
depends = mcl_init, mcl_particles, mcl_mobs, mcl_wip, mcl_core, mcl_util
|
||||||
optional_depends = default, mcl_tnt, mcl_bows, mcl_throwing, mcl_fishing, bones, mesecons_materials, doc_items, mcl_worlds
|
optional_depends = default, mcl_tnt, mcl_bows, mcl_throwing, mcl_fishing, bones, mesecons_materials, doc_items
|
||||||
|
|
Binary file not shown.
|
@ -39,7 +39,7 @@ local ocelot = {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 6.2,
|
bone_eye_height = 6.2,
|
||||||
head_eye_height = 0.4,
|
head_eye_height = 0.4,
|
||||||
horizontal_head_height=-0,
|
horrizonatal_head_height=-0,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
curiosity = 4,
|
curiosity = 4,
|
||||||
collisionbox = {-0.3, -0.01, -0.3, 0.3, 0.69, 0.3},
|
collisionbox = {-0.3, -0.01, -0.3, 0.3, 0.69, 0.3},
|
||||||
|
|
|
@ -137,7 +137,7 @@ mcl_mobs.register_mob("mobs_mc:parrot", {
|
||||||
xp_max = 3,
|
xp_max = 3,
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 1.1,
|
bone_eye_height = 1.1,
|
||||||
horizontal_head_height=0,
|
horrizonatal_head_height=0,
|
||||||
curiosity = 10,
|
curiosity = 10,
|
||||||
collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.89, 0.25},
|
collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.89, 0.25},
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
|
|
|
@ -22,7 +22,7 @@ mcl_mobs.register_mob("mobs_mc:pig", {
|
||||||
head_swivel = "head.control",
|
head_swivel = "head.control",
|
||||||
bone_eye_height = 7.5,
|
bone_eye_height = 7.5,
|
||||||
head_eye_height = 0.8,
|
head_eye_height = 0.8,
|
||||||
horizontal_head_height=-1,
|
horrizonatal_head_height=-1,
|
||||||
curiosity = 3,
|
curiosity = 3,
|
||||||
head_yaw="z",
|
head_yaw="z",
|
||||||
makes_footstep_sound = true,
|
makes_footstep_sound = true,
|
||||||
|
@ -82,7 +82,7 @@ mcl_mobs.register_mob("mobs_mc:pig", {
|
||||||
end
|
end
|
||||||
|
|
||||||
-- if driver present allow control of horse
|
-- if driver present allow control of horse
|
||||||
if self.driver and self.driver:get_wielded_item():get_name() == "mcl_mobitems:carrot_on_a_stick" then
|
if self.driver then
|
||||||
|
|
||||||
mcl_mobs.drive(self, "walk", "stand", false, dtime)
|
mcl_mobs.drive(self, "walk", "stand", false, dtime)
|
||||||
|
|
||||||
|
@ -149,14 +149,18 @@ mcl_mobs.register_mob("mobs_mc:pig", {
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Should make pig go faster when right clicked with carrot on a stick.
|
-- Mount or detach player
|
||||||
-- FIXME: needs work on the going faster part.
|
local name = clicker:get_player_name()
|
||||||
--[[if self.driver and clicker == self.driver and self.driver:get_wielded_item():get_name() == "mcl_mobitems:carrot_on_a_stick" then
|
if self.driver and clicker == self.driver then
|
||||||
if not self.v3 then
|
-- Detach if already attached
|
||||||
self.v3 = 0
|
mcl_mobs.detach(clicker, {x=1, y=0, z=0})
|
||||||
self.max_speed_forward = 100
|
return
|
||||||
self.accel = 10
|
|
||||||
end
|
elseif not self.driver and self.saddle == "yes" and wielditem:get_name() == "mcl_mobitems:carrot_on_a_stick" then
|
||||||
|
-- Ride pig if it has a saddle and player uses a carrot on a stick
|
||||||
|
|
||||||
|
mcl_mobs.attach(self, clicker)
|
||||||
|
|
||||||
if not minetest.is_creative_enabled(clicker:get_player_name()) then
|
if not minetest.is_creative_enabled(clicker:get_player_name()) then
|
||||||
|
|
||||||
local inv = self.driver:get_inventory()
|
local inv = self.driver:get_inventory()
|
||||||
|
@ -173,19 +177,6 @@ mcl_mobs.register_mob("mobs_mc:pig", {
|
||||||
end
|
end
|
||||||
inv:set_stack("main",self.driver:get_wield_index(), wielditem)
|
inv:set_stack("main",self.driver:get_wield_index(), wielditem)
|
||||||
end
|
end
|
||||||
end]]
|
|
||||||
|
|
||||||
-- Mount or detach player
|
|
||||||
local name = clicker:get_player_name()
|
|
||||||
if self.driver and clicker == self.driver then -- and self.driver:get_wielded_item():get_name() ~= "mcl_mobitems:carrot_on_a_stick" then -- Note: This is for when the ability to make the pig go faster is implemented
|
|
||||||
-- Detach if already attached
|
|
||||||
mcl_mobs.detach(clicker, {x=1, y=0, z=0})
|
|
||||||
return
|
|
||||||
|
|
||||||
elseif not self.driver and self.saddle == "yes" then
|
|
||||||
-- Ride pig if it has a saddle
|
|
||||||
|
|
||||||
mcl_mobs.attach(self, clicker)
|
|
||||||
return
|
return
|
||||||
|
|
||||||
-- Capture pig
|
-- Capture pig
|
||||||
|
@ -204,18 +195,6 @@ mcl_mobs.register_mob("mobs_mc:pig", {
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
|
||||||
after_activate = function(self, staticdata, def, dtime)
|
|
||||||
if self.saddle == "yes" then -- Make saddle load upon rejoin
|
|
||||||
self.base_texture = {
|
|
||||||
"mobs_mc_pig.png", -- base
|
|
||||||
"mobs_mc_pig_saddle.png", -- saddle
|
|
||||||
}
|
|
||||||
self.object:set_properties({
|
|
||||||
textures = self.base_texture
|
|
||||||
})
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
mcl_mobs:spawn_specific(
|
mcl_mobs:spawn_specific(
|
||||||
|
|
|
@ -25,10 +25,7 @@ function mobs_mc.player_wears_gold(player)
|
||||||
for i=1, 6 do
|
for i=1, 6 do
|
||||||
local stack = player:get_inventory():get_stack("armor", i)
|
local stack = player:get_inventory():get_stack("armor", i)
|
||||||
local item = stack:get_name()
|
local item = stack:get_name()
|
||||||
if string.find(item, "mcl_armor:chestplate_gold")
|
if item == "mcl_armor:chestplate_gold" or item == "mcl_armor:leggings_gold" or item == "mcl_armor:helmet_gold" or item == "mcl_armor:boots_gold" then
|
||||||
or string.find(item, "mcl_armor:leggings_gold")
|
|
||||||
or string.find(item, "mcl_armor:helmet_gold")
|
|
||||||
or string.find(item, "mcl_armor:boots_gold") then
|
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -38,11 +35,9 @@ end
|
||||||
--################### piglin
|
--################### piglin
|
||||||
--###################
|
--###################
|
||||||
local piglin = {
|
local piglin = {
|
||||||
description = S("Piglin"),
|
|
||||||
type = "monster",
|
type = "monster",
|
||||||
passive = false,
|
passive = false,
|
||||||
spawn_class = "hostile",
|
spawn_class = "hostile",
|
||||||
group_attack = {"mobs_mc:piglin", "mobs_mc:sword_piglin", "mobs_mc:piglin_brute"},
|
|
||||||
hp_min = 16,
|
hp_min = 16,
|
||||||
hp_max = 16,
|
hp_max = 16,
|
||||||
xp_min = 9,
|
xp_min = 9,
|
||||||
|
@ -67,8 +62,8 @@ local piglin = {
|
||||||
},
|
},
|
||||||
jump = true,
|
jump = true,
|
||||||
makes_footstep_sound = true,
|
makes_footstep_sound = true,
|
||||||
walk_velocity = 1.4,
|
walk_velocity = 4.317,
|
||||||
run_velocity = 2.8,
|
run_velocity = 5.6121,
|
||||||
drops = {
|
drops = {
|
||||||
{name = "mcl_bows:crossbow",
|
{name = "mcl_bows:crossbow",
|
||||||
chance = 10,
|
chance = 10,
|
||||||
|
@ -183,7 +178,6 @@ mcl_mobs.register_mob("mobs_mc:piglin", piglin)
|
||||||
|
|
||||||
|
|
||||||
local sword_piglin = table.copy(piglin)
|
local sword_piglin = table.copy(piglin)
|
||||||
sword_piglin.description = S("Sword Piglin")
|
|
||||||
sword_piglin.mesh = "extra_mobs_sword_piglin.b3d"
|
sword_piglin.mesh = "extra_mobs_sword_piglin.b3d"
|
||||||
sword_piglin.textures = {"extra_mobs_piglin.png", "default_tool_goldsword.png"}
|
sword_piglin.textures = {"extra_mobs_piglin.png", "default_tool_goldsword.png"}
|
||||||
sword_piglin.on_spawn = function(self)
|
sword_piglin.on_spawn = function(self)
|
||||||
|
@ -212,132 +206,43 @@ sword_piglin.animation = {
|
||||||
punch_start = 189,
|
punch_start = 189,
|
||||||
punch_end = 198,
|
punch_end = 198,
|
||||||
}
|
}
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:sword_piglin", sword_piglin)
|
mcl_mobs.register_mob("mobs_mc:sword_piglin", sword_piglin)
|
||||||
|
|
||||||
|
local zombified_piglin = table.copy(piglin)
|
||||||
-- Zombified Piglin --
|
zombified_piglin.fire_resistant = 1
|
||||||
|
zombified_piglin.do_custom = function()
|
||||||
|
return
|
||||||
local function spawn_check(pos, environmental_light, artificial_light, sky_light)
|
|
||||||
return artificial_light <= 11
|
|
||||||
end
|
end
|
||||||
|
zombified_piglin.on_spawn = function()
|
||||||
local zombified_piglin = {
|
return
|
||||||
description = S("Zombie Piglin"),
|
end
|
||||||
-- type="animal", passive=false: This combination is needed for a neutral mob which becomes hostile, if attacked
|
zombified_piglin.on_rightclick = function()
|
||||||
type = "animal",
|
return
|
||||||
passive = false,
|
end
|
||||||
spawn_class = "passive",
|
zombified_piglin.lava_damage = 0
|
||||||
hp_min = 20,
|
zombified_piglin.fire_damage = 0
|
||||||
hp_max = 20,
|
zombified_piglin.attack_animals = true
|
||||||
xp_min = 6,
|
zombified_piglin.mesh = "extra_mobs_sword_piglin.b3d"
|
||||||
xp_max = 6,
|
zombified_piglin.textures = {"extra_mobs_zombified_piglin.png", "default_tool_goldsword.png", "extra_mobs_trans.png"}
|
||||||
armor = {undead = 90, fleshy = 90},
|
zombified_piglin.attack_type = "dogfight"
|
||||||
attack_type = "dogfight",
|
zombified_piglin.animation = {
|
||||||
group_attack = {"mobs_mc:zombified_piglin", "mobs_mc:baby_zombified_piglin"},
|
stand_speed = 30,
|
||||||
damage = 9,
|
walk_speed = 30,
|
||||||
reach = 2,
|
punch_speed = 45,
|
||||||
head_swivel = "head.control",
|
run_speed = 30,
|
||||||
bone_eye_height = 2.4,
|
stand_start = 0,
|
||||||
head_eye_height = 1.4,
|
stand_end = 79,
|
||||||
curiosity = 15,
|
walk_start = 168,
|
||||||
collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3}, -- same
|
walk_end = 187,
|
||||||
visual = "mesh",
|
run_start = 440,
|
||||||
mesh = "mobs_mc_zombie_pigman.b3d",
|
run_end = 459,
|
||||||
textures = { {
|
punch_start = 189,
|
||||||
"blank.png", --baby
|
punch_end = 198,
|
||||||
"default_tool_goldsword.png", --sword
|
|
||||||
"mobs_mc_zombie_pigman.png", --pigman
|
|
||||||
} },
|
|
||||||
visual_size = {x=3, y=3},
|
|
||||||
sounds = {
|
|
||||||
random = "mobs_mc_zombiepig_random",
|
|
||||||
war_cry = "mobs_mc_zombiepig_war_cry",
|
|
||||||
death = "mobs_mc_zombiepig_death",
|
|
||||||
damage = "mobs_mc_zombiepig_hurt",
|
|
||||||
distance = 16,
|
|
||||||
},
|
|
||||||
jump = true,
|
|
||||||
makes_footstep_sound = true,
|
|
||||||
spawn_check = spawn_check,
|
|
||||||
walk_velocity = .8,
|
|
||||||
run_velocity = 2.6,
|
|
||||||
pathfinding = 1,
|
|
||||||
drops = {
|
|
||||||
{name = "mcl_mobitems:rotten_flesh",
|
|
||||||
chance = 1,
|
|
||||||
min = 1,
|
|
||||||
max = 1,
|
|
||||||
looting = "common"},
|
|
||||||
{name = "mcl_core:gold_nugget",
|
|
||||||
chance = 1,
|
|
||||||
min = 0,
|
|
||||||
max = 1,
|
|
||||||
looting = "common"},
|
|
||||||
{name = "mcl_core:gold_ingot",
|
|
||||||
chance = 40, -- 2.5%
|
|
||||||
min = 1,
|
|
||||||
max = 1,
|
|
||||||
looting = "rare"},
|
|
||||||
{name = "mcl_tools:sword_gold",
|
|
||||||
chance = 100 / 8.5,
|
|
||||||
min = 1,
|
|
||||||
max = 1,
|
|
||||||
looting = "rare"},
|
|
||||||
},
|
|
||||||
animation = {
|
|
||||||
stand_speed = 25,
|
|
||||||
walk_speed = 25,
|
|
||||||
run_speed = 50,
|
|
||||||
stand_start = 40,
|
|
||||||
stand_end = 80,
|
|
||||||
walk_start = 0,
|
|
||||||
walk_end = 40,
|
|
||||||
run_start = 0,
|
|
||||||
run_end = 40,
|
|
||||||
punch_start = 90,
|
|
||||||
punch_end = 130,
|
|
||||||
},
|
|
||||||
lava_damage = 0,
|
|
||||||
fire_damage = 0,
|
|
||||||
fear_height = 4,
|
|
||||||
view_range = 16,
|
|
||||||
harmed_by_heal = true,
|
|
||||||
fire_damage_resistant = true,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:zombified_piglin", zombified_piglin)
|
mcl_mobs.register_mob("mobs_mc:zombified_piglin", zombified_piglin)
|
||||||
|
|
||||||
local baby_zombified_piglin = table.copy(zombified_piglin)
|
|
||||||
baby_zombified_piglin.description = S("Baby Zombie Piglin")
|
|
||||||
baby_zombified_piglin.collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.94, 0.25}
|
|
||||||
baby_zombified_piglin.xp_min = 13
|
|
||||||
baby_zombified_piglin.xp_max = 13
|
|
||||||
baby_zombified_piglin.textures = {
|
|
||||||
{
|
|
||||||
"mobs_mc_zombie_pigman.png", --baby
|
|
||||||
"default_tool_goldsword.png", --sword
|
|
||||||
"mobs_mc_zombie_pigman.png", --pigman
|
|
||||||
}
|
|
||||||
}
|
|
||||||
baby_zombified_piglin.walk_velocity = 1.2
|
|
||||||
baby_zombified_piglin.run_velocity = 2.4
|
|
||||||
baby_zombified_piglin.light_damage = 0
|
|
||||||
baby_zombified_piglin.child = 1
|
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:baby_zombified_piglin", baby_zombified_piglin)
|
|
||||||
|
|
||||||
-- Compatibility code. These were removed, and now are called zombie piglins. They don't spawn.
|
|
||||||
-- This is only to catch old cases. Maybe could be an alias?
|
|
||||||
mcl_mobs.register_mob("mobs_mc:pigman", zombified_piglin)
|
|
||||||
mcl_mobs.register_mob("mobs_mc:baby_pigman", baby_zombified_piglin)
|
|
||||||
|
|
||||||
|
|
||||||
-- Piglin Brute --
|
|
||||||
|
|
||||||
local piglin_brute = table.copy(piglin)
|
local piglin_brute = table.copy(piglin)
|
||||||
piglin_brute.description = S("Piglin Brute")
|
|
||||||
piglin_brute.xp_min = 20
|
piglin_brute.xp_min = 20
|
||||||
piglin_brute.xp_max = 20
|
piglin_brute.xp_max = 20
|
||||||
piglin_brute.hp_min = 50
|
piglin_brute.hp_min = 50
|
||||||
|
@ -374,17 +279,10 @@ piglin_brute.animation = {
|
||||||
punch_end = 198,
|
punch_end = 198,
|
||||||
}
|
}
|
||||||
piglin_brute.can_despawn = false
|
piglin_brute.can_despawn = false
|
||||||
|
piglin_brute.group_attack = { "mobs_mc:piglin", "mobs_mc:piglin_brute" }
|
||||||
piglin_brute.drops = {
|
|
||||||
{name = "mcl_tools:axe_gold",
|
|
||||||
chance = 8.5,
|
|
||||||
min = 1,
|
|
||||||
max = 1,},
|
|
||||||
}
|
|
||||||
mcl_mobs.register_mob("mobs_mc:piglin_brute", piglin_brute)
|
mcl_mobs.register_mob("mobs_mc:piglin_brute", piglin_brute)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- Regular spawning in the Nether
|
-- Regular spawning in the Nether
|
||||||
mcl_mobs:spawn_specific(
|
mcl_mobs:spawn_specific(
|
||||||
"mobs_mc:piglin",
|
"mobs_mc:piglin",
|
||||||
|
@ -407,9 +305,9 @@ mcl_mobs:spawn_specific(
|
||||||
"nether",
|
"nether",
|
||||||
"ground",
|
"ground",
|
||||||
{
|
{
|
||||||
"Nether",
|
"Nether",
|
||||||
"CrimsonForest"
|
"CrimsonForest"
|
||||||
},
|
},
|
||||||
0,
|
0,
|
||||||
minetest.LIGHT_MAX+1,
|
minetest.LIGHT_MAX+1,
|
||||||
30,
|
30,
|
||||||
|
@ -417,45 +315,6 @@ minetest.LIGHT_MAX+1,
|
||||||
3,
|
3,
|
||||||
mcl_vars.mg_lava_nether_max,
|
mcl_vars.mg_lava_nether_max,
|
||||||
mcl_vars.mg_nether_max)
|
mcl_vars.mg_nether_max)
|
||||||
|
-- spawn eggs
|
||||||
mcl_mobs:spawn_specific(
|
|
||||||
"mobs_mc:zombified_piglin",
|
|
||||||
"nether",
|
|
||||||
"ground",
|
|
||||||
{
|
|
||||||
"Nether",
|
|
||||||
"CrimsonForest",
|
|
||||||
},
|
|
||||||
0,
|
|
||||||
minetest.LIGHT_MAX+1,
|
|
||||||
30,
|
|
||||||
6000,
|
|
||||||
3,
|
|
||||||
mcl_vars.mg_nether_min,
|
|
||||||
mcl_vars.mg_nether_max)
|
|
||||||
|
|
||||||
-- Baby zombie is 20 times less likely than regular zombies
|
|
||||||
mcl_mobs:spawn_specific(
|
|
||||||
"mobs_mc:baby_zombified_piglin",
|
|
||||||
"nether",
|
|
||||||
"ground",
|
|
||||||
{
|
|
||||||
"Nether",
|
|
||||||
"CrimsonForest",
|
|
||||||
},
|
|
||||||
0,
|
|
||||||
minetest.LIGHT_MAX+1,
|
|
||||||
30,
|
|
||||||
100000,
|
|
||||||
4,
|
|
||||||
mcl_vars.mg_nether_min,
|
|
||||||
mcl_vars.mg_nether_max)
|
|
||||||
|
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:piglin","overworld",0,7)
|
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:sword_piglin","overworld",0,7)
|
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:piglin_brute","overworld",0,7)
|
|
||||||
mcl_mobs:non_spawn_specific("mobs_mc:zombified_piglin","overworld",0,minetest.LIGHT_MAX+1)
|
|
||||||
|
|
||||||
mcl_mobs.register_egg("mobs_mc:piglin", S("Piglin"), "#7b4a17","#d5c381", 0)
|
mcl_mobs.register_egg("mobs_mc:piglin", S("Piglin"), "#7b4a17","#d5c381", 0)
|
||||||
mcl_mobs.register_egg("mobs_mc:piglin_brute", S("Piglin Brute"), "#562b0c","#ddc89d", 0)
|
mcl_mobs.register_egg("mobs_mc:piglin_brute", S("Piglin Brute"), "#562b0c","#ddc89d", 0)
|
||||||
mcl_mobs.register_egg("mobs_mc:zombified_piglin", S("Zombie Piglin"), "#ea9393", "#4c7129", 0)
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue