minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1146 commits 1 branch 0 tags 7.9 MiB
Commit graph

462 commits

Author SHA1 Message Date
dependabot[bot]
4ba30a98aa
Bump mods/ctf/ctf_map/ctf_map_core/maps from 5fe0d7b to fa7fa3e (#873) 2021-04-29 19:27:22 +00:00
savilli
47cc8928f7
Increase the distance between the same map on maps shuffling (#869) 2021-04-29 06:49:58 -07:00
_Lucy
2cfbd9b4c4
Make cobble stairs craftable (#860) 
* Update init.lua

* Update init.lua
 2021-04-28 07:20:21 -07:00
philipmi
67214a79ab Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-04-24 21:33:30 +02:00
Toby1710
7733c2cb67
Prevent empty messages in team chat (#830) 
* Update init.lua

* Update init.lua

* Update init.lua

* Update mods/ctf/ctf_chat/init.lua

Co-authored-by: David Leal <halfpacho@gmail.com>

* Update init.lua

* Update mods/ctf/ctf_chat/init.lua

Co-authored-by: David Leal <halfpacho@gmail.com>

* Update init.lua

Co-authored-by: David Leal <halfpacho@gmail.com>
 2021-04-21 08:46:56 -07:00
Lars Müller
c8612a69e4
Fix bounties being shown to the same team on join (#865) 
* Fix bounties being shown to the same team on join

* Fix submodules
 2021-04-16 10:09:16 -07:00
savilli
0df01b9308
Fix double map skipping (#866) 2021-04-16 09:24:24 -07:00
philipmi
e23dbb3d80 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-04-07 21:40:56 +02:00
Lars Müller
5eb02e32e4
Indestructible map nodes: Fix wool aliases (#859) 2021-04-07 10:33:19 -07:00
philipmi
c1b3604a97 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-04-07 16:58:38 +02:00
LoneWolfHT
6be1373cae Revert "Create indestructible nodes after all mods load" 
This reverts commit 8b1de22854.
 2021-04-06 21:37:44 -07:00
LoneWolfHT
6cf958800b Update maps submodule 2021-04-06 21:35:44 -07:00
LoneWolfHT
8b1de22854
Create indestructible nodes after all mods load 2021-04-06 21:21:42 -07:00
savilli
665ec17c69
Fix suicider color in kill event on the hud (#857) 2021-04-06 08:48:48 -07:00
Lars Müller
2be9adb890
Fix cleanup (#856) 
* Map nodes: Readd wool aliases

* Fix undefined behavior

* Merge branch 'fix-immortal-fences' into fix-cleanup

* Set buildable_to to false for immortal nodes
 2021-04-06 08:07:58 -07:00
Lars Müller
f965b310fd
Map nodes: Readd wool aliases (#855) 2021-04-06 07:14:36 -07:00
LoneWolfHT
f774ecff0f
Kill the trailing whitespace 2021-04-05 08:24:00 -07:00
Lars Müller
4d680e6b6c
Code duplication cleanup (#827) 
* Code duplication cleanup

* Fix torches, no immortal variants for some nodes
 2021-04-05 08:22:24 -07:00
Lars Müller
433509bcdd
Announce bounties only to the enemy team (#849) 2021-04-05 07:41:51 -07:00
LoneWolfHT
c0f224a5bc
Medic paxel improvements 2021-04-04 09:06:40 -07:00
Lars Müller
c5560f7a2d
Use huds with more player notifications (#853) 2021-04-01 10:17:17 -07:00
LoneWolfHT
bc519e605a
Fix crash when no paxel stop reason is given 2021-04-01 09:52:13 -07:00
philipmi
cd355bc9cd Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-03-31 18:36:17 +02:00
Lars Müller
87f7212f43
Replace chat with HUD events, add BS 5 palette (#848) 
* Replace chat with HUD events, add BS 5 palette

* Use HUD events for paxel too

* Move paxel_stop function up
 2021-03-29 14:00:46 -07:00
philipmi
16c31aa273 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-03-29 15:04:23 +02:00
savilli
243061957a
Postpone map skipping until flag holder captures or loses the flag (#835) 
* Postpone map skipping until flag holder captures or loses the flag

* Wait 5s after flag drop
 2021-03-24 07:34:02 -07:00
philipmi
ed65ddb6d0 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 
 Conflicts:
	mods/other/random_messages/init.lua
 2021-03-22 11:25:11 +01:00
LoneWolfHT
1568de3449
Fix crash 2021-03-19 08:31:52 -07:00
dependabot-preview[bot]
9e844d8d71
Update Maps Submodule (#836) 
Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps) from `eb88118` to `bbf6007`.
- [Release notes](https://github.com/MT-CTF/maps/releases)
- [Commits](eb881181cc...bbf6007785)

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-19 08:30:47 -07:00
LoneWolfHT
96147c7b97
Log /me command when used and fix bug 2021-03-18 19:03:07 -07:00
LoneWolfHT
ebd332a3c6
Appease luacheck 2021-03-18 17:48:21 -07:00
LoneWolfHT
e9f09c3587
Send /me output to IRC 2021-03-18 17:45:11 -07:00
WINNIE
05fdcaa31e
Lower Paxel Cooldown (#832) 2021-03-17 08:26:58 -07:00
LoneWolfHT
36a6f4117a
Fix crash fix not fixing crash 2021-03-16 16:41:34 -07:00
philipmi
327504b131 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-03-16 20:15:20 +01:00
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
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
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
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
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
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
philipmi
03767c1dc5 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-02-09 21:34:41 +01: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
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
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
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
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
LoneWolfHT
92203a0c83 Lots of crafting changes/simplification 2021-01-06 12:58:20 -08:00