Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
6,896 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

1382 Commits (eae71fdf5527015efe0b6f8dcab428aa9bd2da61)

Author SHA1 Message Date
jordan4ibanez 13c321e8f2 Re-enable mob spawning 2021-04-23 18:03:01 -04:00
jordan4ibanez f7ed71bcdc Merge pull request 'Don't do knockback effect for mobs when hurt by a rider' (#1629) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1629
 2021-04-23 21:45:13 +00:00
jordan4ibanez ea6912c980 Don't do knockback effect for mobs when hurt by a rider 2021-04-23 17:44:49 -04:00
jordan4ibanez 11785a9434 Merge pull request 'Make mobs run away slightly faster' (#1628) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1628
 2021-04-23 21:37:47 +00:00
jordan4ibanez 8dafac50a8 Make mobs run away slightly faster 2021-04-23 17:37:20 -04:00
jordan4ibanez 129987a38e Merge pull request 'Remove unused code and variables from mob punch' (#1627) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1627
 2021-04-23 21:29:55 +00:00
jordan4ibanez 3560bda4a5 Remove unused code and variables from mob punch 2021-04-23 17:29:23 -04:00
jordan4ibanez a6dae8e5a8 Merge pull request 'Color modifier for punched mobs and fixing breaking velocity when punched' (#1626) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1626
 2021-04-23 21:28:03 +00:00
jordan4ibanez 9720986c4d Fix punching a mob breaking it's velocity 2021-04-23 17:27:08 -04:00
jordan4ibanez dc7592528c Add red tint hurt effect 2021-04-23 17:23:00 -04:00
jordan4ibanez 9486d1bf23 Merge pull request 'Fix ocelots and add in skittish mob behavior' (#1625) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1625
 2021-04-23 21:13:01 +00:00
jordan4ibanez 304cbed447 Make mobs that should be skittish, skittish 2021-04-23 17:12:02 -04:00
jordan4ibanez af4c42fea7 Add skittish behavior (runaway from punch) and fix ocelot 2021-04-23 17:10:44 -04:00
jordan4ibanez 8daf197fb8 Fix iron golem rotation 2021-04-23 16:52:07 -04:00
jordan4ibanez c138050e0b Make iron golem neutral and protective, fix rotation 2021-04-23 16:45:12 -04:00
jordan4ibanez d04e694d1a Merge pull request 'Stop dead mobs from getting in the way of fighting other mobs' (#1623) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1623
 2021-04-23 20:35:52 +00:00
jordan4ibanez 36d5af1d15 Stop dead mobs from getting in the way of fighting other mobs 2021-04-23 16:35:16 -04:00
jordan4ibanez db0e3a389d Merge pull request 'Two fixes to mobs' (#1622) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1622
 2021-04-23 20:31:48 +00:00
jordan4ibanez 73b4d3c1d2 stop projectile mobs from being completely disabled while stunned 2021-04-23 16:31:13 -04:00
jordan4ibanez eb7ae5e10e Fix random crash 2021-04-23 16:28:30 -04:00
jordan4ibanez 43fdc08030 Merge pull request 'Add new mob hit sounds' (#1621) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1621
 2021-04-23 20:23:09 +00:00
jordan4ibanez c831da2c02 Fix mobs not making hit sound when hit by node 2021-04-23 16:22:34 -04:00
jordan4ibanez d5a38fef58 Add in new mob punched sounds 2021-04-23 16:19:37 -04:00
jordan4ibanez 8ea546abfb Merge pull request 'Overhaul horse' (#1620) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1620
 2021-04-23 20:04:44 +00:00
jordan4ibanez 8e7ce5a72a Add in a visual for horse taming (hearts) 2021-04-23 16:04:01 -04:00
jordan4ibanez 189c0ad157 Half finish horse (riding logic, etc) 2021-04-23 15:53:01 -04:00
jordan4ibanez 53fb683d33 Merge pull request 'Fix llama blaze and ghast projectile sprites' (#1619) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1619
 2021-04-23 18:51:05 +00:00
jordan4ibanez f64f8e31e3 Fix llama blaze and ghast projectile sprites 2021-04-23 14:50:38 -04:00
jordan4ibanez 7faf2460b7 Merge pull request 'Fixes to mobs' (#1618) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1618
 2021-04-23 18:50:10 +00:00
jordan4ibanez 58bee2a2dd Fix projectile tails clipping through sprite 2021-04-23 14:43:00 -04:00
jordan4ibanez 16cc7e37d2 Randomize projectile cooldown timer 2021-04-23 14:34:59 -04:00
jordan4ibanez 8eb9ba12ce Fix crash when mob collides with nil entity 2021-04-23 14:33:40 -04:00
jordan4ibanez d231edbb43 Merge pull request 'Massive overhaul to projectile mobs with custom projectile function, make llamas spit' (#1617) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1617
 2021-04-23 18:10:52 +00:00
jordan4ibanez 5d59583583 Massive overhaul to projectile mobs with custom projectile function, make llamas spit 2021-04-23 14:10:12 -04:00
jordan4ibanez adeea8ed43 Merge pull request 'Fix enderman' (#1616) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1616
 2021-04-23 17:36:16 +00:00
jordan4ibanez f6fa90096d Fix enderman teleport attack 2021-04-23 13:35:30 -04:00
jordan4ibanez 4fb9e69e41 Make enderman become hostile when stared at, freeze when attacking when stared at 2021-04-23 13:27:17 -04:00
jordan4ibanez 99f13f84b5 Half-fix enderman 2021-04-23 13:13:23 -04:00
jordan4ibanez 3788886518 Merge pull request 'Fix wolves and make chickens slow fall' (#1614) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1614
 2021-04-23 17:07:11 +00:00
jordan4ibanez dd76b15c50 Make ghasts not insta-kill 2021-04-23 13:06:57 -04:00
jordan4ibanez b6f19699e9 Make enderdragon half work 2021-04-23 13:06:17 -04:00
jordan4ibanez 4efec1ef58 Add in chicken slow falling 2021-04-23 12:55:11 -04:00
Elias Fleckenstein 988a44148e Merge branch 'master' into mineclone5 2021-04-23 18:11:41 +02:00
Elias Fleckenstein a03e7f6f3a Re-enable player ignition from lava 2021-04-23 13:46:20 +02:00
Elias Fleckenstein 78355c5c57 Integrate totems 2021-04-23 13:40:51 +02:00
jordan4ibanez 0895666407 Fix random crash with mixed mob ally data types 2021-04-22 23:36:58 -04:00
jordan4ibanez 408296140a Fix and overhaul wolves 2021-04-22 23:30:32 -04:00
jordan4ibanez aac1e19336 Implement rotation locking when standing, fix rotation unlock/lock for fly/swim mobs 2021-04-22 23:18:33 -04:00
jordan4ibanez fa059b5df2 Fix ghast's eyeheight 2021-04-22 22:59:03 -04:00
jordan4ibanez 2e3e92e393 Fix ghast's insane difficulty 2021-04-22 22:58:32 -04:00
jordan4ibanez 11bcf3aa34 Add attributes to epCode 2021-04-22 22:51:13 -04:00
jordan4ibanez 2099be43ea Update to epCode's fixed version of ghast model 2021-04-22 22:50:14 -04:00
jordan4ibanez 5037ec3736 Fix ghasts horrible collisionbox 2021-04-22 22:40:16 -04:00
jordan4ibanez 0a8fff6524 Add in mob criticals when falling 2021-04-22 22:08:54 -04:00
jordan4ibanez afdcada1fd Fix endermite 2021-04-22 21:46:13 -04:00
jordan4ibanez 5d876725c5 Fix bats 2021-04-22 21:45:00 -04:00
jordan4ibanez ef0d52a2df Update backup_code_api.lua 2021-04-22 21:41:54 -04:00
jordan4ibanez 8142f7e512 Add in mob death 2021-04-22 21:36:42 -04:00
jordan4ibanez ebf27866ca Fix typo and error in animation.lua 2021-04-22 21:12:08 -04:00
jordan4ibanez 3fe8d2d3c5 Add file death_logic.lua 2021-04-22 20:30:50 -04:00
jordan4ibanez b73ab976a1 Implement framework for mob death 2021-04-22 20:25:58 -04:00
jordan4ibanez 8530e6ee36 Make mob punching time based 2021-04-22 20:20:56 -04:00
jordan4ibanez e1812b2cdb Reset pause timer to 0 2021-04-22 20:12:02 -04:00
jordan4ibanez 991bba0a1d Add comments into ai.lua 2021-04-22 20:10:01 -04:00
jordan4ibanez f9a7144b65 Implement ability to hurt mobs 2021-04-22 20:07:30 -04:00
jordan4ibanez 45790c0be0 Re-enable mob punching (broken) 2021-04-22 19:12:02 -04:00
jordan4ibanez 31a791c33b Undo debug.txt spam from mob spawning 2021-04-22 18:20:58 -04:00
jordan4ibanez d0d128c1d8 Break infinite loop if unable to find any mob to spawn 2021-04-22 18:18:57 -04:00
jordan4ibanez ee905642c2 Add temporary warning debug to spawning algorithm output 2021-04-22 17:56:38 -04:00
jordan4ibanez 2cef9e7cca Optimize mob spawning even further with additional lua locals 2021-04-22 00:39:32 -04:00
jordan4ibanez edb1939649 Fix mob_counter in mob spawning limiter 2021-04-22 00:27:35 -04:00
jordan4ibanez 7c1adeab45 Hyper-optimize mob spawning 2021-04-22 00:20:57 -04:00
jordan4ibanez ecebe0253c Merge branch 'mineclone5' into mineclone5 2021-04-22 03:29:18 +00:00
jordan4ibanez fbe3ccc5c0 Delete current state of things comment 2021-04-21 23:28:38 -04:00
jordan4ibanez e398aca747 Merge pull request 'Fix sheep and pig rotation' (#1592) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1592
 2021-04-22 03:26:27 +00:00
jordan4ibanez 5e15af260b Fix pig rotation 2021-04-21 23:25:19 -04:00
jordan4ibanez 6aa6364492 Fix sheep rotation 2021-04-21 23:25:10 -04:00
kay27 7c2ea8d7f0 [mineclone5] Merge backup_code_api.lua from latest mineclone5 and playerplus from master 2021-04-22 01:16:22 +04:00
jordan4ibanez 29305f548d Overhaul arrow register, implement basic blaze, break parts of arrow register for now, remove fallback for detecting players 2021-04-21 15:08:35 -04:00
jordan4ibanez 08c90c34e8 Make parrots and squids work with tilt fly/swim 2021-04-21 13:05:46 -04:00
jordan4ibanez 91099c3be9 Fix auto-true statement for tilt fly/swim 2021-04-21 13:01:14 -04:00
jordan4ibanez 71c34823bc Make tilt flying/swimming dynamic 2021-04-21 12:56:36 -04:00
jordan4ibanez 20886f54bb Make shooty mobs jump 2021-04-21 12:48:23 -04:00
jordan4ibanez ebd995fbd2 Simplify skeleton arrow damage calculation 2021-04-21 12:45:02 -04:00
jordan4ibanez c9f71d66f5 Implement skeletons/strays 2021-04-21 12:42:34 -04:00
jordan4ibanez 99e808296b Add missing skeleton/stray run animation 2021-04-21 12:17:51 -04:00
jordan4ibanez 74094938bb Fix crash with non-punch attack mobs in collision 2021-04-21 12:10:29 -04:00
jordan4ibanez 6bd279255c Fully implement zombie pigmen 2021-04-21 11:50:22 -04:00
jordan4ibanez 964ce9ccf7 Temporarily disable spawn eggs from setting owner 2021-04-21 11:42:01 -04:00
jordan4ibanez 5062d56a5d Implement neutral mob mechanics and partial implement of zombie pigmen 2021-04-21 11:00:02 -04:00
jordan4ibanez b0b1ec9436 Implement zombie pigmen and make them turn hostile when punched 2021-04-21 10:53:20 -04:00
jordan4ibanez f1dc286442 Dump mob_punch from backup_code_api.lua back into interaction.lua 2021-04-21 10:23:51 -04:00
jordan4ibanez cc2a0ae52c Complete charged creeper 2021-04-21 10:21:11 -04:00
jordan4ibanez 486959515c Make creepers even more dangerous 2021-04-21 10:20:31 -04:00
Elias Fleckenstein 1e7ba2b605 Merge branch 'master' into damage 2021-04-21 11:32:50 +02:00
Elias Fleckenstein fe5f61c747 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-21 11:31:53 +02:00
Elias Fleckenstein f3c4dd699d Merge branch 'master' into mineclone5 2021-04-21 11:31:39 +02:00
jordan4ibanez 576621169b Make creepers and zombies even harder 2021-04-20 23:26:18 -04:00
jordan4ibanez 2c87bd19f3 Overhaul zombie villager 2021-04-20 23:14:53 -04:00
jordan4ibanez 1ed3377559 Add punch mobs knockback to players when hit 2021-04-20 23:11:18 -04:00
jordan4ibanez 8c9356a18c Implement eye_height and viewing range for hostile mobs, along with making punchy mobs jump over nodes 2021-04-20 22:58:39 -04:00
jordan4ibanez a05ebd7cc2 Add informative text art 2021-04-20 22:44:34 -04:00
jordan4ibanez 60ac3058ce Make zombies more difficult 2021-04-20 22:42:51 -04:00
jordan4ibanez 751c4c2d99 Integrate mob punching into collision detection 2021-04-20 22:41:13 -04:00
jordan4ibanez 6b52b94516 Start setting up hostile punch attack type 2021-04-20 22:30:34 -04:00
jordan4ibanez d371d6fdc9 Adjust creeper explosion settings 2021-04-20 22:04:54 -04:00
jordan4ibanez fabd4d64e6 Slow down creeper type mobs explosion buildup 2021-04-20 21:35:19 -04:00
jordan4ibanez bf367fffd0 Add in sound_handling and make explosion type mobs make their attack sound before explosion animation 2021-04-20 21:34:18 -04:00
jordan4ibanez 0b763f54b5 Finish creeper movement ai and move jump_check into environment 2021-04-20 21:00:36 -04:00
jordan4ibanez cd6f07537f Make creepers even more deadly 2021-04-20 20:43:45 -04:00
jordan4ibanez 9678b556e1 Fix crashes when trying to collision detect a removed mob 2021-04-20 20:33:30 -04:00
jordan4ibanez cdb840609d Add in creeper basic prototype 2021-04-20 20:19:55 -04:00
jordan4ibanez 008d670ed9 Remove wandering from ai 2021-04-20 17:10:51 -04:00
jordan4ibanez 491ef6c8f8 Add in auto mob removal if something goes horribly wrong 2021-04-20 16:48:20 -04:00
jordan4ibanez 348df0fcec Rename detect_players_in_area to detect_closest_player_within_radius 2021-04-20 16:46:10 -04:00
jordan4ibanez ac08c6991c Add in detect_players_in_area 2021-04-20 16:39:05 -04:00
jordan4ibanez 3d776138e9 Start implementing creeper ai 2021-04-20 14:55:22 -04:00
kay27 106ecb0958 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-20 22:08:36 +04:00
epCode c7d91baadf rid some mobs of bouncing animation 2021-04-19 14:29:12 -07:00
Elias Fleckenstein ca74f23094 Merge branch 'master' into damage 2021-04-19 18:58:00 +02:00
Elias Fleckenstein d8d4cb5def Revert color changes to GUI. 
The Minecraft colorset (net.minecraft.util.text.TextFormatting) is only used for chat and tooltips.
This partically reverts 84819bf9f5.
 2021-04-19 14:44:20 +02:00
Elias Fleckenstein 69485f8505 Integrate falling nodes damage 2021-04-19 09:49:29 +02:00
jordan4ibanez 85e531bf10 Remove unneeded mobs:protect from code 2021-04-18 21:24:31 -04:00
jordan4ibanez 4d589dfb2a Remove literally unneeded mobs:capture_mob 2021-04-18 21:22:39 -04:00
jordan4ibanez 39985aa558 Up fallback max xp to 3 2021-04-18 21:22:21 -04:00
jordan4ibanez 1920ddf915 Change all enemy attack info to more workable and understandable attacks 2021-04-18 21:02:03 -04:00
kay27 96694692d8 [mineclone5] Put ITEMS/mcl_core/nodes_trees.lua from master 2021-04-19 00:15:20 +04:00
Elias Fleckenstein f0d7715080 Merge branch 'master' into damage 2021-04-18 14:51:45 +02:00
kay27 bb902caa57 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-18 04:29:59 +04:00
jordan4ibanez 719bb2a3c9 Add in prototype jump-only mobs api 2021-04-17 18:21:33 -04:00
jordan4ibanez db87b8e0a3 fix chicken rotation 2021-04-17 17:09:57 -04:00
jordan4ibanez e2987245fd Balance out collision forces for mobs 2021-04-17 17:00:34 -04:00
jordan4ibanez 3cf263d292 Add in dynamic pitch in flying/swimming mobs 2021-04-17 16:23:38 -04:00
Elias Fleckenstein a7e102426a Add time_of_day to get_light crash fix 2021-04-17 21:01:09 +02:00
Elias Fleckenstein bcd058feb1 Fix get_light crash 2021-04-17 21:00:32 +02:00
jordan4ibanez 5ade34115c Remove random state initialization in set_up.lua 2021-04-17 13:17:29 -04:00
jordan4ibanez d9729fc865 Fix parrot's rotation 2021-04-17 13:13:45 -04:00
jordan4ibanez 58d9670e77 Remove collisionbox addition for y position for fly mobs 2021-04-17 13:11:39 -04:00
jordan4ibanez a20f272e08 re-adjust logic gate for mobs floating in water and lava 2021-04-17 13:05:53 -04:00
jordan4ibanez 0794bc5437 Make flying mobs float in water and lava 2021-04-17 13:04:55 -04:00
kay27 ff07ee5d93 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-17 21:02:07 +04:00
jordan4ibanez 8783912938 Add in mobs api swimming animation 2021-04-17 12:48:57 -04:00
jordan4ibanez f2e909ab8d Add in fly logic gate 2021-04-17 12:41:14 -04:00
jordan4ibanez 07841c8963 Swap name of quick_rotate_45 to quick_rotate 2021-04-17 12:38:48 -04:00
jordan4ibanez 240d6ea211 Add note about quick_rotate_45 actually rotating 11.25 degrees 2021-04-17 12:37:04 -04:00
jordan4ibanez e8148f81ab Make underwater mobs try to continuously swim around with quick_rotate_45 2021-04-17 12:36:19 -04:00
jordan4ibanez 061602d9d4 Overhaul separation of swimming and flying for ease of use with writing mobs api 2021-04-17 12:28:07 -04:00
jordan4ibanez 5365dec19a Adjust "flying" vector checks for mobs 2021-04-17 12:01:27 -04:00
Elias Fleckenstein c7c47c1ca7 Increase mob_view_range_factor performance 2021-04-17 13:49:40 +02:00
Elias Fleckenstein ca75a893db Merge branch 'master' into damage 2021-04-17 12:58:19 +02:00