Commit graph

887 commits

Author SHA1 Message Date
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
Emojigit
1da0840f11
Add medkit interrupt reasons (#729) 2021-01-03 09:20:59 -08:00
LoneWolfHT
0d09cae845 Fix bug with new map 2021-01-01 08:01:22 -08:00
LoneWolfHT
e0a448a300 Update Maps Submodule 2020-12-31 09:10:44 -08:00
LoneWolfHT
95c2677620 Update maps submodule 2020-12-27 10:04:14 -08:00
LoneWolfHT
009b5d952c Make combat loggers give more score than usual 2020-12-27 10:03:27 -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
LoneWolfHT
fbf0126599
Allow more than two teams in a match at once (#724)
* Fix bugs with more than two teams

* Fix team allocation

* Fix bugz

* Fix crash

* Fix crash with crash fix
2020-12-25 10:37:02 -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
76db63ca4e Fix bug with players respawning as match ends 2020-12-23 13:24:40 -08:00
LoneWolfHT
df065cece1 Nerf gun knockback a little 2020-12-23 13:10:48 -08:00
-sniper-
bafcc3a667
Make bounties scale more (#720)
* improve bounties

* give players with less than 50k pts lower bounty

* Update init.lua

* Update init.lua
2020-12-23 09:29:38 -08:00
LoneWolfHT
97aa3df3a0 Make treasure chests glow 2020-12-22 08:21:58 -08:00
LoneWolfHT
53a31fbdad Improve/fix a few things 2020-12-22 08:21:58 -08:00