Commit graph

136 commits

Author SHA1 Message Date
philipmi
19c897cc98 Change rocket mechanics 2022-07-01 23:24:57 +02:00
philipmi
b3ea22dad1 Update shooter submodule 2021-07-21 22:17:19 +02:00
philipmi
73adac73c3 Nerf guns 2021-06-23 16:13:50 +02:00
philipmi
b0b4052408 Update shooter submodule 2021-05-24 21:51:59 +02:00
philipmi
4b9298c530 Reduce place limit to 4 NPS 2021-05-07 21:33:52 +02:00
philipmi
fd79c14b85 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-05-07 21:20:30 +02:00
LoneWolfHT
6d5f046d41
Fix texurepacks being able to hide grenade smoke (#876)
* Fix texurepacks being able to hide grenade smoke

* Update smoke texture
2021-05-04 10:05:14 -07:00
Lars Müller
4f49560569
Medkits: Don't give back if map is skipped (#870) 2021-04-29 06:54:29 -07:00
philipmi
c1b3604a97 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-04-07 16:58:38 +02:00
savilli
054e1389c4
Make your last hitter get a kill if you suicide any possible way (#840) 2021-04-01 08:33:07 -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
Lars Müller
e40d1e666a
place_limit: Use HUD notifications & quota instead of time between placements (#844)
* place_limit: Use HUD notifications

* Adjust warning color

* Quota instead of time between placements

* Bump maps submodule
2021-03-28 12:45:49 -07:00
Lars Müller
7382db367b
Limit node placement to 5 NPS (#803)
* Limit placement to 5 nodes per second

* Add Readme, check pointed thing, inform player

* Include team door fix

* Add license
2021-03-27 07:27:22 -07:00
philipmi
5d956ffac3 Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-03-08 17:30:36 +01: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
55f833c68b Merge branch 'master' of https://github.com/MT-CTF/capturetheflag 2021-02-21 18:21:41 +01: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
faf74cbcb0 Improve shooter_rocket 2021-02-15 14:11:08 +01: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
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
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
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
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
LoneWolfHT
4e3844bd00 Fix kill_assist percentage 2021-02-09 12:12:39 -08: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
LoneWolfHT
510ca896cd
Revert "Add kill assists (#755)" (#781)
This reverts commit 49f4e6fd47.
2021-02-05 15:46:29 -08: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
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
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
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
Emojigit
1da0840f11
Add medkit interrupt reasons (#729) 2021-01-03 09:20:59 -08:00
Apelta
2f3b09ff70
Fix sniper crosshairs being active after death (#726)
* Fix bug with crosshairs active after death

(hopefully) fixes issue with crosshairs remaining after player death. Requires testing.
How to test:
- die while scoped

Normally I would do this but I am unable to get to a proper platform to test.

* Use function

Slipped my mind, sorry :P

* Fix typo, comment

Fixed typo in line 100, also fixed comment for dieplayer function
2020-12-26 21:01:36 -08:00
Apelta
0ef16edb23
Add antisabotage mod (#725)
* Add antisabotage mod

Prevents players of the same team from mining under or (somewhat) near others. Even works whilst crouching.

* Fix slight issue of infinite items and radius fix

Fixed issues dealing with unused variables, item removal and radius of the effect

* Add newline so github doesn't die

* Various improvements to function and distance

Improvements/changes to improve performance and readability suggested by Lone_Wolf.

* Create mod description

Add readme.txt with description

* Update with suggestions from Lone_Wolf

Various performance optimizations and other issues suggested by Lone_Wolf

* Remove unnecessary dependency

* Snowball effect applied to a quick fix

* Reword readme

* Add license.txt

MIT

* Rename readme.txt to readme.md

Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2020-12-25 10:36:32 -08:00
LoneWolfHT
df065cece1 Nerf gun knockback a little 2020-12-23 13:10:48 -08:00
Apelta
678689eb58
Add crosshair for sniper rifles (#721)
* Upload rifle_crosshair.png

Image used for rifle crosshair. Created by PiMonkey.

* sniper_rifles: Add crosshair for rifles via HUD

HUD-driven crosshair for sniper rifles.

NOTE: scale_const is set to 4, this may be changed by preference.

* Increase size slightly

Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2020-12-18 17:37:48 -08:00
LoneWolfHT
31048422c8 Fix grenades crash 2020-12-11 20:46:19 -08:00
LoneWolfHT
a7848bf163 Fix smoke grenade texture 2020-12-10 10:38:50 -08:00