Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Classes rework #994

Merged
merged 18 commits into from
Apr 6, 2022
Merged

Classes rework #994

merged 18 commits into from
Apr 6, 2022

Conversation

LoneWolfHT
Copy link
Member

No description provided.

@LoneWolfHT
Copy link
Member Author

@appgurueu you may review if interested. Performance improvements may be possible combat-wise

Copy link
Contributor

@appgurueu appgurueu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not as short as it could be. Some things are hacky.

mods/apis/ctf_gui/dev.lua Show resolved Hide resolved
mods/apis/ctf_gui/init.lua Outdated Show resolved Hide resolved
mods/apis/ctf_gui/init.lua Outdated Show resolved Hide resolved
mods/ctf/ctf_combat/ctf_melee/init.lua Outdated Show resolved Hide resolved
mods/ctf/ctf_combat/ctf_melee/init.lua Outdated Show resolved Hide resolved
mods/ctf/ctf_modes/ctf_mode_classes/classes.lua Outdated Show resolved Hide resolved
mods/ctf/ctf_player/init.lua Show resolved Hide resolved
mods/ctf/ctf_player/init.lua Outdated Show resolved Hide resolved
mods/mtg/mtg_player_api/api.lua Outdated Show resolved Hide resolved
mods/other/wield3d/init.lua Outdated Show resolved Hide resolved
@LoneWolfHT LoneWolfHT force-pushed the classes-rework branch 3 times, most recently from 82f20ee to f88d622 Compare March 3, 2022 01:17
mods/apis/ctf_gui/dev.lua Outdated Show resolved Hide resolved
@LoneWolfHT LoneWolfHT force-pushed the classes-rework branch 2 times, most recently from 24ddf88 to f728700 Compare March 10, 2022 18:07
@LoneWolfHT
Copy link
Member Author

I think I've addressed everything, just need to add a user setting for the wielditem displaying now

@LoneWolfHT LoneWolfHT force-pushed the classes-rework branch 2 times, most recently from 157d97a to 7e3cbf1 Compare March 16, 2022 18:04
@appgurueu
Copy link
Contributor

appgurueu commented Mar 25, 2022

Note: Those warnings are were completely valid. not x == y is (not x) == y due to the precedencies of not and ==. Changing not x == y which was intended as not (x == y) to x ~= y fixes the ifs; before it was probably impossible for them to trigger.

@LoneWolfHT
Copy link
Member Author

I'm going to revert the knight sword change, and use it in a new mode later on. Code is ready for review

Comment on lines +112 to +116
-- ctf_melee.register_sword("ctf_mode_classes:knight_sword", {
-- description = "Knight Sword",
-- inventory_image = "default_tool_bronzesword.png",
-- damage_groups = {fleshy = 5},
-- })
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Outcommented code. Has to be removed eventually.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I figured I'd leave it there for a bit as a reminder

@LoneWolfHT
Copy link
Member Author

Going to merge now, I will keep an eye on the server to fix any issues that arise. This has had testing already so I think it will go smoothly

@LoneWolfHT LoneWolfHT merged commit c412c60 into MT-CTF:master Apr 6, 2022
@LoneWolfHT LoneWolfHT deleted the classes-rework branch April 6, 2022 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants