David Leal
1ef6ddadfd
Fix changing to the same class being treated as a change to a different class ( #829 )
...
* Fix running cooldown when changing...
...to the same class.
* Implement savilli's suggestion
Co-authored-by: savilli <savilli@users.noreply.github.com>
* Move return and remove unneeded check
* Completely remove an if check as now unneeded
* Remove whitespace from empty line
Co-authored-by: savilli <savilli@users.noreply.github.com>
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-03-15 20:08:01 -07:00
LoneWolfHT
844436ca3d
Fix crash with shooter_hook
2021-03-15 08:30:54 -07:00
LoneWolfHT
0ed4cadb7c
Add missing priv check to /join cmd
2021-03-15 08:25:14 -07:00
philipmi
62e0fe449e
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-03-15 09:47:38 +01:00
sodomite
3bb4dddc21
Add indestructible papyrus ( #776 )
...
* Add indestructible papyrus
* Update nodes.lua
* Update nodes.lua
* Update nodes.lua
* Update nodes.lua
2021-03-12 10:10:39 -08:00
-sniper-
723301dd12
Sword marker: Decrease cooldowns, fix trivial bug ( #826 )
...
* Improve sword markers
* Fix timer
* checks every 2 seconds
* Edit string sent to chat
* Clean up and increase sword special cooldown
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-03-12 09:02:30 -08:00
Xenon
6fb0510b73
Add hud_events mod ( #825 )
...
* Add hud_events
Reuses the HUD API provided by hud_scores
* Fix luacheck
2021-03-12 08:29:46 -08:00
philipmi
efbe6dc7b4
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-03-10 16:29:13 +01:00
Xenon
30e9ac02fb
Add /mr command ( #824 )
...
* Add /mr command
Add option to remove your placed marker
* Change marker message
2021-03-09 20:53:11 -08:00
philipmi
5d956ffac3
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-03-08 17:30:36 +01:00
dependabot-preview[bot]
0eb6071733
Update Maps Submodule ( #823 )
...
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps ) from `c6fd7be` to `eb88118`.
- [Release notes](https://github.com/MT-CTF/maps/releases )
- [Commits](c6fd7bedd4...eb881181cc
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-03-08 07:21:43 -08:00
Minetest-j45
5409f33f24
Remove combat HUDs at start of new match ( #822 )
...
* Remove coward HUD on new game
* Update init.lua
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-03-07 11:09:36 -08:00
philipmi
90a5f37496
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
...
Conflicts:
mods/ctf/ctf_map/ctf_map_core/chest.lua
mods/other/random_messages/init.lua
2021-02-25 21:10:28 +01:00
LoneWolfHT
da3d7487f6
Update mods talking about pro requirements, add Discord link in Help tab ( #813 )
...
* Update mods talking about pro requirements
* Update chest.lua
* Update chest.lua
* Update init.lua
2021-02-25 09:29:53 -08:00
philipmi
a189946d82
Fix /makepro
2021-02-25 17:48:15 +01:00
philipmi
9de5000fb8
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
...
Conflicts:
mods/ctf/ctf_map/ctf_map_core/chest.lua
mods/ctf/ctf_stats/init.lua
2021-02-25 17:34:31 +01:00
LoneWolfHT
9e20609ed6
Fix /makepro not handling captures
2021-02-25 06:42:13 -08:00
Toby1710
0282bce349
Change grapple hook warning message ( #808 )
...
Co-authored-by: Toby1710 <69259430+Toby1710@users.noreply.github.com>
2021-02-25 06:27:49 -08:00
MinetestSam
e9487c6bde
Consider captures as a requirement for pro players ( #541 )
...
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-02-24 08:53:07 -08:00
philipmi
c0abdb245b
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-24 14:15:43 +01:00
dependabot-preview[bot]
216aa1d856
Update Maps Submodule ( #807 )
...
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps ) from `877ad69` to `c6fd7be`.
- [Release notes](https://github.com/MT-CTF/maps/releases )
- [Commits](877ad69027...c6fd7bedd4
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-22 08:09:48 -08:00
philipmi
55f833c68b
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-21 18:21:41 +01:00
Toby1710
c56c4a9de2
Add message when player can't heal another player ( #805 )
...
* Add message when player can't heal
* Edit message
2021-02-20 18:52:13 -08:00
rubenwardy
d717547d41
Add class choice metrics
2021-02-20 21:10:25 +00:00
Apelta
fe53e06966
Remove antisabotage in favor of human moderation ( #806 )
...
* Purge antisabotage for active moderation
Not needed with more active moderation (guardians, moderator increases as of recent)
* Fix luacheck
2021-02-20 11:31:34 -08:00
philipmi
4a2d298828
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-20 11:27:01 +01:00
rubenwardy
939b2d1c5b
Remove accidental debug assert in ctf_metrics
2021-02-19 22:42:11 +00:00
rubenwardy
cca78bc62a
Rename /ctf_queue_restart to /restart
2021-02-19 22:34:10 +00:00
rubenwardy
25c9f09d6e
Update ctf_metrics
2021-02-19 22:28:34 +00:00
rubenwardy
1e80291664
Add log level to avoid logs being printed to chat
2021-02-19 22:24:57 +00:00
philipmi
011fc7f573
Make a Capture Rate of 33% and 10 captures a requirement for pro players
2021-02-19 18:12:25 +01:00
philipmi
380a252c7e
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-19 13:23:29 +01:00
Toby1710
5bdb99d184
Change class item warning ( #802 )
2021-02-17 14:01:25 -08:00
philipmi
772cf49209
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-17 12:47:37 +01:00
Avyukt More
b15e09e763
Add Savanna Dirt and Savanna Dirt with Savanna Grass ( #800 )
...
* Add Savanna Dirt
* Add textures for Savanna grass
* Update mods/mtg/default/nodes.lua
* Debugging
2021-02-16 06:14:14 -08:00
philipmi
d0e00944ca
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-15 18:05:29 +01:00
dependabot-preview[bot]
b630dacfb9
Update Maps Submodule ( #798 )
...
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps ) from `b7b2f83` to `877ad69`.
- [Release notes](https://github.com/MT-CTF/maps/releases )
- [Commits](b7b2f83388...877ad69027
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-15 08:01:53 -08:00
philipmi
faf74cbcb0
Improve shooter_rocket
2021-02-15 14:11:08 +01:00
philipmi
14159a953c
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-15 14:03:10 +01:00
Avyukt More
66784b72af
Map Maker Improvements ( #757 )
...
* Updating Changes
* Giving an Example of initial_stuff
* Unification
* Improving English
* Better English
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* Adding Pistol example for initia_stuff
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* Update
* Update gui.lua
* Update gui.lua
* Update README.md
* Better English
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* Optional Data
* Each Word Matters
* Update gui.lua
* Update gui.lua
* Map.mts instead of only .mts
* www.humus.name suggestion for skybox images
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* Update README.md
* "choose" instead of "chooze"
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* small sentence
* Adding missing word "is"
* "the" instead of "The"
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
* removing useless sentences
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
Co-authored-by: -sniper- <47271658+JostP@users.noreply.github.com>
2021-02-14 20:53:41 -08:00
philipmi
7157751405
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-14 22:06:32 +01:00
LoneWolfHT
87bd607856
Fix combat not ending on death
2021-02-14 11:17:17 -08:00
philipmi
f3d0067d8c
Update shooter submodule
2021-02-14 12:21:17 +01:00
philipmi
7f75da82ff
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-14 11:32:58 +01:00
savilli
abf1fa2ad5
Don't count kill assist on build time or player immunity ( #795 )
...
* Don't count kill assist on build time or player immunity
* Remove register_can_attack, use can_attack global func
2021-02-13 14:17:05 -08:00
philipmi
ca8cde8a0a
Add "Capture Rate" statistic
2021-02-13 20:53:29 +01:00
philipmi
7c0283df64
Merge remote-tracking branch 'upstream/master'
2021-02-13 20:40:42 +01:00
LoneWolfHT
3e95d92359
Make SMG semi-auto with more damage
2021-02-11 14:01:10 -08:00
dependabot-preview[bot]
3a63361814
Change SMG to burst fire ( #796 )
...
Bumps [mods/pvp/shooter](https://github.com/MT-CTF/shooter ) from `e856150` to `394d915`.
- [Release notes](https://github.com/MT-CTF/shooter/releases )
- [Commits](e856150c13...394d9154d3
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-11 13:42:18 -08:00
philipmi
5a9558ca7e
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-11 17:09:18 +01:00
dependabot-preview[bot]
8b3e694b56
Update maps submodule ( #792 )
...
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps ) from `ad7dad2` to `b7b2f83`.
- [Release notes](https://github.com/MT-CTF/maps/releases )
- [Commits](ad7dad2eea...b7b2f83388
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-11 06:21:24 -08:00
philipmi
65118f5e72
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-11 11:26:54 +01:00
savilli
5f456a504a
Make ctf_stats award kills again ( #788 )
...
* Restore register_on_killedplayer callback in ctf_stats
* Remove unused args
Co-authored-by: savilli <savilli>
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-02-10 21:18:09 -08:00
LoneWolfHT
6a12dcc12a
Fix kill_assist crash
2021-02-10 20:57:29 -08:00
LoneWolfHT
88e6fb7af9
Fix potential kill assist bug
2021-02-10 19:14:12 -08:00
philipmi
69b025d794
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-10 13:58:19 +01:00
LoneWolfHT
c703733e6f
Clean up kill assist code
2021-02-09 19:15:36 -08:00
LoneWolfHT
fdfad82844
Fix incorrect usage of math.min
2021-02-09 19:11:19 -08:00
LoneWolfHT
615d4369f6
Improve kill assist mod
2021-02-09 16:10:53 -08:00
philipmi
03767c1dc5
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-09 21:34:41 +01:00
LoneWolfHT
4e3844bd00
Fix kill_assist percentage
2021-02-09 12:12:39 -08:00
LoneWolfHT
17278e22a4
Reduce initial autovote delay to 50+ minutes
2021-02-09 09:42:23 -08:00
dependabot-preview[bot]
f786784ba8
Update Maps Submodule ( #787 )
...
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps ) from `2b22d20` to `ad7dad2`.
- [Release notes](https://github.com/MT-CTF/maps/releases )
- [Commits](2b22d20362...ad7dad2eea
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-09 07:51:01 -08:00
philipmi
63d2b14d37
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-09 08:11:16 +01:00
LoneWolfHT
eb71f5e385
Make combat log count as death
2021-02-08 16:09:53 -08:00
Anthony-De
f8cb85be9f
Fix up and re-add kill assists ( #782 )
...
* Add kill assists
* Fix bug
* Move to seperate mod
* Fix bugs and improve code some more
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-02-08 16:03:03 -08:00
philipmi
c988792d02
Bump mods/ctf/ctf_map/ctf_map_core/maps from e8dffc7
to 2b22d20
2021-02-08 20:28:50 +01:00
dependabot-preview[bot]
c9c2f6c7e0
Update Maps submodule ( #786 )
...
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps ) from `08f5719` to `2b22d20`.
- [Release notes](https://github.com/MT-CTF/maps/releases )
- [Commits](08f571991b...2b22d20362
)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-08 08:37:36 -08:00
philipmi
04c75c989d
Re-add rocketeer class
2021-02-07 21:53:20 +01:00
-sniper-
928476c371
Add sound when walking on wool ( #783 )
2021-02-07 07:06:08 -08:00
LoneWolfHT
510ca896cd
Revert "Add kill assists ( #755 )" ( #781 )
...
This reverts commit 49f4e6fd47
.
2021-02-05 15:46:29 -08:00
dependabot-preview[bot]
8315d0074a
Bump mods/ctf/ctf_map/ctf_map_core/maps from e8dffc7
to 08f5719
( #780 )
2021-02-05 13:58:35 +00:00
Avyukt More
02fa088b24
Misc crafting changes ( #773 )
...
* Crafting Changes
* Smoke Grenade Crafting Change
* using group:wood instead of default:wood
* Adding Diamonds Craftable
* Update init.lua
* Changing value of the "ctf_traps:dirt" to 5 to craft at a time
Co-authored-by: Toby1710 <69259430+Toby1710@users.noreply.github.com>
* Equality between ctf_traps:dirt n ctf_traps:cobble
Co-authored-by: Toby1710 <69259430+Toby1710@users.noreply.github.com>
2021-02-04 06:30:01 -08:00
dependabot-preview[bot]
87d9057278
Bump mods/ctf/ctf_map/ctf_map_core/maps from 9dd765d
to e8dffc7
( #778 )
2021-02-02 14:32:07 +00:00
Anthony-De
49f4e6fd47
Add kill assists ( #755 )
...
* Update teams.lua
* Update teams.lua and init.lua
* Update teams.lua and init.lua
* Update teams.lua and init.lua
* Update teams.lua and init.lua Kill assist implemented
* Update init.lua Remove unused variables
* Added ctf.clearAssists function
Only awards those who did more that 50% of damage
Clears attackers stats after suicide
* Remove unused variable
* Minor modifications
renamed ctf.clearAssists to ctf.clear_assists
changed playerName to player
* Cap assist points
* Reaching full health while in combat clears assist data
* split points between assisting players by damage done
* Reworked assist data storage to work with a table rather than player metadata
* Fix lua check
* Removed duplicate scoring
* Change kill assist color
* Health regen subtracts from assist.
Suicide gives assist points
* Fixed accessing nil value for max_hp
* Corrected max_hp
* hardcode hp list for max hp
2021-02-01 08:24:29 -08:00
-sniper-
6515f1e189
Improve initial team chest items ( #770 )
2021-01-31 08:33:57 -08:00
dependabot-preview[bot]
e09ed4d0ea
Bump mods/ctf/ctf_map/ctf_map_core/maps from bbbe390
to 9dd765d
( #765 )
2021-01-28 15:26:57 +00:00
-sniper-
1b62c12b4d
Allow steel trapdoors to be opened by players ( #764 )
...
* steel doors and trapdoors: protected = false
2021-01-28 07:20:03 -08:00
RyanZem
5e955ad4a4
Color score green in bounty messages ( #745 )
...
* Delete init.lua
* Make bounty color green "bounty_score points!"
* Delete init.lua
* Make in bounty green color (bounty_score points!)
* Update init.lua
* Update init.lua
* Update init.lua
* Update init.lua
* Update init.lua
* Update init.lua
* Update init.lua
* Update mods/ctf/ctf_bounties/init.lua
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-01-25 10:49:13 -08:00
Toby1710
b49909fc50
Change colors for /r output ( #759 )
...
* Change stats color when type /r
Co-authored-by: David Leal <halfpacho@gmail.com>
2021-01-23 09:13:13 -08:00
Xenon
6fc6c8e871
Shorten marker message ( #760 )
2021-01-23 09:10:06 -08:00
realOneplustwo
ec36999fa3
Fix respawn immunity ending when hitting teammate ( #742 )
2021-01-20 10:09:55 -08:00
Apelta
62cedd9267
Fix medkits not allocating deaths/score after death ( #749 )
...
* Fix medkits preventing kills or score from being given on death
* Remove HUD
2021-01-17 20:25:08 -08:00
Apelta
2e3ffe8be0
Fix out of date random_message ( #751 )
2021-01-17 20:19:38 -08:00
dependabot-preview[bot]
0c9cd8ea2e
Bump mods/ctf/ctf_map/ctf_map_core/maps from a643b6c
to bbbe390
( #743 )
2021-01-08 15:33:07 +00:00
David Leal
a412c02e20
Remove grapple if player changes class after throwing ( #740 )
...
* Remove hook if player has changed...
...their class after firing the hook.
* Make grapple don't return to...
...player inventory and improve message.
* Update ranged.lua
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-01-07 17:35:34 -08:00
dependabot-preview[bot]
870add029d
Bump mods/other/crafting from 6072315
to b4ac60b
( #741 )
2021-01-06 21:23:43 +00:00
LoneWolfHT
92203a0c83
Lots of crafting changes/simplification
2021-01-06 12:58:20 -08:00
LoneWolfHT
22b7ee1ce5
Make special tools bronze instead of steel
2021-01-06 12:58:20 -08:00
LoneWolfHT
df171d5534
Remove tin and copper ores
2021-01-06 12:58:20 -08:00
LoneWolfHT
0f45a101b7
Make damage cobble hurt ranged weapon users
2021-01-06 12:58:20 -08:00
LoneWolfHT
355a171949
Give sniper rifles the ability to break nodes again
2021-01-06 12:58:20 -08:00
LoneWolfHT
8c33103e4c
Fix up some minetest.is_protected functions
2021-01-06 12:58:20 -08:00
LoneWolfHT
72d27ca1ce
Update crafting submodule
2021-01-06 12:58:20 -08:00
LoneWolfHT
3b291eab0d
Increase paxel antipillar speed 5x
2021-01-06 12:58:20 -08:00
dependabot-preview[bot]
b273533e01
Bump mods/other/crafting from 6072315
to b4ac60b
( #738 )
2021-01-06 16:41:49 +00:00
Apelta
10881d4211
Fix antisabotage bugs and make to work with paxel( #731 )
...
* Fix crucial bugs with antisabotage
Fix possible crashes, infinite items, and any related issues
* Make sabotage into function to be used with paxel
* Fix paxel to work with antisabotage
* Fix whitespace for luacheck
* Update mods/pvp/antisabotage/init.lua
Remove unnecessary newline
Co-authored-by: David Leal <halfpacho@gmail.com>
* Update function
* Update function name
* Add check for antisabotage
* Remove whitespace for luacheck
* Add antisabotage as an optional dependency
* Remove more whitespace
Co-authored-by: David Leal <halfpacho@gmail.com>
* Fix optional depends
dev wiki lied to me :(
Co-authored-by: David Leal <halfpacho@gmail.com>
* Fix up a comment P.1
* Move a line in mod.conf
* Fix up comments and spacing
Co-authored-by: David Leal <halfpacho@gmail.com>
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-01-05 20:14:55 -08:00
Emojigit
88c326f13d
Fix up medkit interrupt reasons ( #734 )
...
* Bugfix of "Add reason to medkit"
* Fix reasons while attack and damage
* Remove `die` reason, add `attack` reason
* Change suggested code
* Fix doc
* fix line contains trailing whitespace
* Update init.lua
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-01-05 19:56:55 -08:00
Emojigit
518e3f0807
Fix medkit interrupt reason ( #732 )
...
* Add medkit interrupt reason and some bugfix
* Bugfix
* Fix Bug
2021-01-04 20:27:43 -08:00
Apelta
3cfb3539ed
Fix furnace crash ( #730 )
...
Adds check to prevent crash, temporary fix for maps which include furnaces
2021-01-04 08:54:07 -08:00