VoxeLibre/VoxeLibre
VoxeLibre
/
VoxeLibre
57
134
Fork 173
Code Issues 943 Pull Requests 87 Projects 4 Releases Wiki Activity

Add magma block damage #1952

Closed
GuyLiner wants to merge 11 commits from GuyLiner/MineClone2:magma into master
pull from: GuyLiner/MineClone2:magma
merge into: VoxeLibre:master
Conversation 12 Commits 11 Files Changed 2 +14 -1
GuyLiner commented 2022-01-04 17:22:22 +01:00
Contributor
Copy Link

This PR fixes #630

In minecraft mobs are damaged when they step on magma blocks, as you probably already know. This adds that functionality, however this is nowhere near being finished.

My main point in putting in this PR is to see if I'm on the right track or if this implementation is not sound. I also added some comments along the way as I was learning my way around the code.

I created a new timer called damage_timer and another function called node_hurt. When a mob steps on the block, it gets hurt. In minecraft when mobs are on magma blocks they don't try to move, so nothing AI wise has to be coded there.

Certain mobs are also not affected by this damage, which wouldn't be too hard to add either.

If I get the go ahead, I'd like to add cacti, and enderman water damage as well.

This PR fixes #630 In minecraft mobs are damaged when they step on magma blocks, as you probably already know. This adds that functionality, however this is nowhere near being finished. My main point in putting in this PR is to see if I'm on the right track or if this implementation is not sound. I also added some comments along the way as I was learning my way around the code. I created a new timer called <code>damage_timer</code> and another function called <code>node_hurt</code>. When a mob steps on the block, it gets hurt. In minecraft when mobs are on magma blocks they don't try to move, so nothing AI wise has to be coded there. Certain mobs are also not affected by this damage, which wouldn't be too hard to add either. If I get the go ahead, I'd like to add cacti, and enderman water damage as well.
GuyLiner added 6 commits 2022-01-04 17:22:30 +01:00
kay27 commented 2022-01-04 17:28:22 +01:00
Contributor
Copy Link

Looks good, welcome merging it into MCL5, as MCL2 Mob API is under refactoring by Fleckenstein... let's do all mob-related stuff in MCL5 right now, then, after MCL2 0.72 release let's just backport it. Am I right, @EliasFleckenstein03 ?

Looks good, welcome merging it into MCL5, as MCL2 Mob API is under refactoring by Fleckenstein... let's do all mob-related stuff in MCL5 right now, then, after MCL2 0.72 release let's just backport it. Am I right, @EliasFleckenstein03 ?
GuyLiner added 1 commit 2022-01-07 04:17:51 +01:00
NO11 reviewed 2022-01-08 19:22:48 +01:00
mods/ENTITIES/mcl_mobs/api/mob_functions/ai.lua Outdated
@ -785,0 +790,4 @@
self.damage_timer = self.damage_timer - dtime
--This gets the coords of the node below the mob
cur_pos['y'] = cur_pos['y'] - 1
NO11 commented 2022-01-08 19:22:48 +01:00
Member
Copy Link

You can use cur_pos.y instead of cur_pos['y'] here.

You can use `cur_pos.y` instead of `cur_pos['y']` here.
NO11 marked this conversation as resolved
GuyLiner added 1 commit 2022-01-11 16:51:59 +01:00
AFCMS added the
mobs
 label 2022-02-27 14:33:36 +01:00
FossFanatic commented 2022-12-19 22:20:23 +01:00
Contributor
Copy Link

Closed for inactivity, can be reopened if the contributor wants to resume work on this.

Closed for inactivity, can be reopened if the contributor wants to resume work on this.
FossFanatic closed this pull request 2022-12-19 22:20:24 +01:00
GuyLiner commented 2023-02-03 02:58:18 +01:00
Author
Contributor
Copy Link

Forgot the original PR was closed, is there something else I need to do with this or was the original code just trash?

Forgot the original PR was closed, is there something else I need to do with this or was the original code just trash?
FossFanatic commented 2023-02-03 08:23:10 +01:00
Contributor
Copy Link

Forgot the original PR was closed, is there something else I need to do with this or was the original code just trash?

No idea about the code. Feel free to reopen this if you want to request this be merged.

>Forgot the original PR was closed, is there something else I need to do with this or was the original code just trash? No idea about the code. Feel free to reopen this if you want to request this be merged.
GuyLiner commented 2023-02-03 17:27:26 +01:00
Author
Contributor
Copy Link

Alright thanks

Alright thanks
GuyLiner reopened this pull request 2023-02-05 00:54:09 +01:00
GuyLiner commented 2023-02-05 00:56:02 +01:00
Author
Contributor
Copy Link

This looks like it might have to be re-done, I don't think the files are in the same place they used to be.

This looks like it might have to be re-done, I don't think the files are in the same place they used to be.
GuyLiner added 1 commit 2023-02-05 05:25:12 +01:00
034b4cb710 Added conditional based on existing fire damage conditional that will apply fire damage to a 
mob standing on top of a magma node that belongs to the "fire" group. The magma node
has also been added to the fire group, making it so that standing on the node will
do damage to the mob.

In official Minecraft, magma blocks just do fire damage without the fire animation.
Source: https://minecraft.fandom.com/wiki/Magma_Block
GuyLiner changed title from WIP: #630, Initial support for magma block damage to WIP: Add magma block damage 2023-02-05 05:26:16 +01:00
GuyLiner changed title from WIP: Add magma block damage to Add magma block damage 2023-02-05 05:26:43 +01:00
GuyLiner commented 2023-02-05 05:28:27 +01:00
Author
Contributor
Copy Link

I think that should do it, unless I'm about to to get roasted for naming a variable nodef2 lol

I think that should do it, unless I'm about to to get roasted for naming a variable nodef2 lol
😆 1
Michieal commented 2023-02-05 06:32:50 +01:00
Member
Copy Link

I think that should do it, unless I'm about to to get roasted for naming a variable nodef2 lol

Why would you be roasted? That is not how we approach things here now.

> I think that should do it, unless I'm about to to get roasted for naming a variable nodef2 lol Why would you be roasted? That is not how we approach things here now.
GuyLiner commented 2023-02-05 06:36:19 +01:00
Author
Contributor
Copy Link

Lol I was just worried I fucked up a convention or something, but you guys are nice so I'm not really worried.

Lol I was just worried I fucked up a convention or something, but you guys are nice so I'm not really worried.
❤️ 1
Michieal commented 2023-02-05 07:15:13 +01:00
Member
Copy Link

Well, hopefully in code, it is obvious what it refers too. I mean, I've seen worse variable names... if it's not, I would at least comment what it refers to. But, that's me.

Well, hopefully in code, it is obvious what it refers too. I mean, I've seen worse variable names... if it's not, I would at least comment what it refers to. But, that's me.
ancientmarinerdev commented 2023-02-06 00:46:15 +01:00
Owner
Copy Link

Initial glances look good, but I will rebase on to a fresh branch and test, as there is stuff from a year ago that isn't needed.

Ok, I have recreated the branch here with just the final commit:

MineClone2/MineClone2#3405

Initial glances look good, but I will rebase on to a fresh branch and test, as there is stuff from a year ago that isn't needed. Ok, I have recreated the branch here with just the final commit: https://git.minetest.land/MineClone2/MineClone2/pulls/3405
ancientmarinerdev commented 2023-02-06 01:24:26 +01:00
Owner
Copy Link

@GuyLiner MineClone2/MineClone2#3405 (comment)

Approval comment in this branch. Thanks for picking it up. Welcome back! :)

@GuyLiner https://git.minetest.land/MineClone2/MineClone2/pulls/3405#issuecomment-62306 Approval comment in this branch. Thanks for picking it up. Welcome back! :)

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
#P1 CRITICAL

for crashes, catastrophic bugs, etc.

  
#P2: HIGH

highest priority level

  
#P3: elevated

2nd-highest priority level

  
#P4 priority: medium

for things that aren't elevated but have been prioritised

  
#P6: low

low priority level

  
#Review

Tickets that may improve or fix an issue but will need a review after a short period of time

  
annoying

non-bugs that annoys people

  
API

   
bug

   
code quality

   
combat

   
commands

   
compatibility

Label to cover migration issues from old worlds or mcl5

  
configurability

   
contribution inside

   
controls

   
core feature

   
creative mode

   
delayed for engine release

   
documentation

   
duplicate

   
enhancement

enhancement request/suggestion

  
environment

Issues that affect weather or light

  
gameplay

   
graphics

   
ground content conflict

mapgen gc-specific quirks

  
GUI/HUD

   
help wanted

   
incomplete feature

   
invalid / won't fix

Invalid, or will not fix

  
items

   
looking for contributor

   
mapgen

   
meta

Relating to VoxeLibre on Mesehub and elsewhere

  
mineclone2+

fit for MineClone2-Plus

  
Minecraft >= 1.13

   
Minecraft >= 1.17

   
missing feature

   
mobile

involving Minetest on mobile devices (android)

  
mobs

   
mod support

Issues related to mod support

  
model needed

A model is needed to be created or updated

  
multiplayer

Issues affecting multiplayer

  
Needs adoption

PR needs author action or to be adopted so changes can be implemented to get the PR closer to merge

  
needs discussion

   
needs engine change

   
needs more information

   
needs research

   
nodes

   
non-Minecraft feature

   
non-mob entities

   
performance

   
player

issues related to the player

  
possible close

   
redstone

   
release notes

This ticket will need information adding to release notes

  
schematics

   
Skyblock

   
sounds

   
Testing / Retest

This needs testing or retesting

  
tools

Related to the tools scripts, which aren't run in game

  
translation

   
unconfirmed
  
mcl5

Possibly relevant for MineClone5

  
mcla

Possibly relevant for Mineclonia

  
Media missing

media files for this feature are missing - contributions welcome

No Label
#P1 CRITICAL
#P2: HIGH
#P3: elevated
#P4 priority: medium
#P6: low
#Review
annoying
API
bug
code quality
combat
commands
compatibility
configurability
contribution inside
controls
core feature
creative mode
delayed for engine release
documentation
duplicate
enhancement
environment
gameplay
graphics
ground content conflict
GUI/HUD
help wanted
incomplete feature
invalid / won't fix
items
looking for contributor
mapgen
meta
mineclone2+
Minecraft >= 1.13
Minecraft >= 1.17
missing feature
mobile
mobs
mod support
model needed
multiplayer
Needs adoption
needs discussion
needs engine change
needs more information
needs research
nodes
non-Minecraft feature
non-mob entities
performance
player
possible close
redstone
release notes
schematics
Skyblock
sounds
Testing / Retest
tools
translation
unconfirmed
mcl5
mcla
Media missing
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
6 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: VoxeLibre/VoxeLibre#1952
No description provided.
Delete Branch "GuyLiner/MineClone2:magma"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?