[Ready for Testmerge] Implement Diagonal Movement #11358

Couls · 2019-04-22T23:50:42Z

What does this PR do:
Port over TG diagonal movement and their keybinding system(macros will not work for diagonal movement)

Changelog:
🆑
add: Diagonal movement
add: Input subsystem(numpad targetting, press numpad 8 multiple times to target eyes and mouth, numpad 6 or 4 to target arms and press them again to target hands and numpad 1 or 3 to target legs and press them again to target feet) taken from tgstation/tgstation#32751
add: change confused status to have you move diagonally randomly in the direction you're headed if not too confused(now you can drunkenly walk down the hall)
add: clients are now children of datums like everything else in BYOND taken from tgstation/tgstation#20394
add: AZERTY and numpad targetting preferences
/:cl:

Diagonal movement
Port the keybinding system
Fix keybinding system
Actually take inputs and it'll be ready for review
Fix quick equip to belt and bag(it currently says you have no backpack when you do)
Implement AZERTY support (numpad targetting toggle is in too)
Fix freezing caused by neckgrabs and resting no longer works too[probably mob_movement
fix numpad targetting not working

NOW REQUIRES SQL UPDATE

Initial, add in diagonal movement

KasparoVy · 2019-04-23T05:35:09Z

Holy fuck, you can hotkey selecting specific zones on the body now (nvm already mapped to numpad, but 'can map them to something more convenient' heheh. Only caviat is that to aim for hands you have to hit the arm select hotkey twice, or to aim for eyes you gotta hit the head hotkey twice.

This is going to be mega robust, I've been thinking about that for ages! This is the future!

code/modules/mob/mob_movement.dm

SkeletalElite · 2019-04-23T13:21:04Z

Holy fuck, you can hotkey selecting specific zones on the body now (nvm already mapped to numpad, but 'can map them to something more convenient' heheh. Only caviat is that to aim for hands you have to hit the arm select hotkey twice, or to aim for eyes you gotta hit the head hotkey twice.

This is going to be mega robust, I've been thinking about that for ages! This is the future!

Yeah its going to be a lot better than what we have now but Id still like to see a radial menu for body part targeting

interface/skin.dmf

mvanalphen · 2019-04-23T17:56:38Z

code/modules/keybindings/setup.dm

+			winset(src, "[setname]-[REF(key)]", "parent=[setname];name=[key];command=[command]")
+
+	if(prefs.toggles & HOTKEYS)
+		winset(src, null, "mapwindow.map.focus=true input.background-color=#e0e0e0")


This doesn't set hotkeys yet.

I still don't know what to do with this yet honestly might need to scrap the check completely later on and just use a separate system

… bunch of misc stuff

code/__DEFINES/combat.dm

AffectedArc07 · 2019-04-24T17:40:08Z

Can we not have the numpad region targeting? This broke my numpad full of emotes before, and a lot of people also have numpads full of emotes, who will also be pissed

Couls · 2019-04-24T20:36:49Z

Once this is working I’ll make it an config option along with AZERTY support

KasparoVy · 2019-04-25T01:23:20Z

Could always have the numpad emotes require another key be pressed shrug

I have mine all long the standard number row but you need to use shift too so it avoids command conflict.
You can also make use of newlines in the macros to have multiple emotes for different races bound to the same key, I. E. Vox rattle, vulp growl + unathi hiss all on one macro

I think we should value standard keybinds for key priority rather than macros because macros can be comb eniently and dynamically remapped. We shouldn't be afraid of utilizing the numpad for this reason

Couls · 2019-04-26T07:22:11Z

I apologize in advance to the poor maintainer who will have to review this frankenstein abomination of code

Couls · 2019-06-03T02:53:52Z

Conflicts Resolved.

Some gifs of me being destroyed by an ash drake with diagonal movement:

code/game/atoms_movable.dm

code/modules/mob/mob_movement.dm

variableundefined · 2019-07-08T09:25:21Z

During the test merge it seems this broke movement for some people inconsistently. Problems reported included:

Arrow keys being assigned to chat bar color toggle
A small menu is brought up to the bottom left of the screen and color is changed when hotkey is activated.
People cannot move at all with tab or not.

I cannot replicate it myself locally for now.

Couls · 2019-07-08T15:18:50Z

Holy crap ninjanomnom fixed it

Shift middle click locks your direction again Spacepods now move again(literally one letter fixed this) Holster hotkey is back!(H to holster and unholster) Hotkey Toggle button has been removed from the bottom bar and verbs

Couls · 2019-07-09T12:00:09Z

code/modules/spacepods/spacepod.dm

@@ -1037,7 +1037,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/spacepod_equipment/SPE, v
 		return stop()

 /obj/spacepod/relaymove(mob/user, direction)
-	if(usr != src.pilot)
+	if(user != src.pilot)


slow clap

KasparoVy · 2019-07-13T02:18:37Z

God bless

Couls added 2 commits April 22, 2019 19:47

Update mob_movement.dm

2068ca0

Initial, add in diagonal movement

Implement keybinding system and remove old hotkey modes

7eb7d72

KasparoVy reviewed Apr 23, 2019

View reviewed changes

code/modules/mob/mob_movement.dm Outdated Show resolved Hide resolved

KasparoVy reviewed Apr 23, 2019

View reviewed changes

code/modules/mob/mob_movement.dm Outdated Show resolved Hide resolved

KasparoVy reviewed Apr 23, 2019

View reviewed changes

code/modules/mob/mob_movement.dm Outdated Show resolved Hide resolved

KasparoVy reviewed Apr 23, 2019

View reviewed changes

code/modules/mob/mob_movement.dm Outdated Show resolved Hide resolved

Couls added 4 commits April 23, 2019 02:01

spessing and fix compile errors

40729f2

SQL entry for hotkey mode

317e0ac

change some move procs

a188a6b

Remove repeat defines and fix focus

09ba038

mvanalphen reviewed Apr 23, 2019

View reviewed changes

interface/skin.dmf Outdated Show resolved Hide resolved

mvanalphen reviewed Apr 23, 2019

View reviewed changes

Fox-McCloud added Do Not Merge This PR must not be merged or closed Feature This PR is a new addition to the game Refactor This PR will clean up the code but have the same ingame outcome Work In Progress This PR is work in progress, and unfinished labels Apr 23, 2019

Couls added 2 commits April 23, 2019 19:55

make clients inherit from datums

4921405

Use our quick equip instead of TGs implementation(for my sake) also a…

896340e

… bunch of misc stuff

KasparoVy reviewed Apr 24, 2019

View reviewed changes

code/__DEFINES/combat.dm Outdated Show resolved Hide resolved

Fix numpad targetting

6917aec

Couls added 3 commits April 25, 2019 23:45

Merge remote-tracking branch 'upstream/master' into diagonal-movement

a8db26d

Fix resting

5b8c344

Update preferences_toggles.dm

69cbb67

Implement AZERTY and numpad targetting options

5903ad2

Couls added 5 commits June 4, 2019 18:33

Merge remote-tracking branch 'upstream/master' into diagonal-movement

e222a1f

Merge remote-tracking branch 'upstream/master' into diagonal-movement

e3a1984

some more tweaks

411a6ec

Merge branch 'master' into diagonal-movement

33d35eb

Merge remote-tracking branch 'upstream/master' into diagonal-movement

a7b4e0b

variableundefined suggested changes Jul 8, 2019

View reviewed changes

code/game/atoms_movable.dm Outdated Show resolved Hide resolved

code/modules/mob/mob_movement.dm Outdated Show resolved Hide resolved

Merge remote-tracking branch 'upstream/master' into diagonal-movement

cee64d5

Fix testmerge issues

4a832c4

Couls changed the title ~~[Ready for Review] Implement Diagonal Movement~~ [Ready for Testmerge] Implement Diagonal Movement Jul 8, 2019

Couls added 3 commits July 9, 2019 02:40

bitflag hotfix

6c8fc34

Update preferences.dm

510181d

More testmerge fixes and improvements

e16b495

Shift middle click locks your direction again Spacepods now move again(literally one letter fixed this) Holster hotkey is back!(H to holster and unholster) Hotkey Toggle button has been removed from the bottom bar and verbs

Couls commented Jul 9, 2019

View reviewed changes

Couls added 6 commits July 9, 2019 08:11

Code cleanup, spacing fixes

2d7f2bb

Remove unused winsets

7b102e2

Improve diagonal pulling

147f740

SQL changes

3625662

update prefixed schema as well

b0ec92d

Update misc.dm

b11a80b

Couls mentioned this pull request Jul 12, 2019

Diagonal movement no SQL changes[FOR TESTMERGE] #11828

Closed

variableundefined merged commit 3673627 into ParadiseSS13:master Jul 12, 2019

ParadiseSS13-Bot added a commit that referenced this pull request Jul 12, 2019

Automatic changelog generation for PR #11358 [ci skip]

cdffdff

variableundefined removed the Do Not Merge This PR must not be merged or closed label Sep 21, 2019

Sheppysneik mentioned this pull request May 6, 2020

when walking diagonally it's possible to lose grip on rolling beds. #13385

Closed

Vallat mentioned this pull request Jul 1, 2021

Ported hotkey system from paradise ss220-space/Baystation12#13

Merged

Bizzonium mentioned this pull request Jul 2, 2021

Порт системы хоткеев с SS220 Paradise infinitystation/Baystation12#2065

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Ready for Testmerge] Implement Diagonal Movement #11358

[Ready for Testmerge] Implement Diagonal Movement #11358

Couls commented Apr 22, 2019 •

edited

Loading

KasparoVy commented Apr 23, 2019 •

edited

Loading

SkeletalElite commented Apr 23, 2019

mvanalphen Apr 23, 2019

Couls Apr 24, 2019 •

edited

Loading

AffectedArc07 commented Apr 24, 2019

Couls commented Apr 24, 2019

KasparoVy commented Apr 25, 2019 •

edited

Loading

Couls commented Apr 26, 2019

Couls commented Jun 3, 2019 •

edited

Loading

variableundefined commented Jul 8, 2019

Couls commented Jul 8, 2019

Couls Jul 9, 2019

KasparoVy commented Jul 13, 2019

[Ready for Testmerge] Implement Diagonal Movement #11358

[Ready for Testmerge] Implement Diagonal Movement #11358

Conversation

Couls commented Apr 22, 2019 • edited Loading

KasparoVy commented Apr 23, 2019 • edited Loading

SkeletalElite commented Apr 23, 2019

mvanalphen Apr 23, 2019

Choose a reason for hiding this comment

Couls Apr 24, 2019 • edited Loading

Choose a reason for hiding this comment

AffectedArc07 commented Apr 24, 2019

Couls commented Apr 24, 2019

KasparoVy commented Apr 25, 2019 • edited Loading

Couls commented Apr 26, 2019

Couls commented Jun 3, 2019 • edited Loading

variableundefined commented Jul 8, 2019

Couls commented Jul 8, 2019

Couls Jul 9, 2019

Choose a reason for hiding this comment

KasparoVy commented Jul 13, 2019

Couls commented Apr 22, 2019 •

edited

Loading

KasparoVy commented Apr 23, 2019 •

edited

Loading

Couls Apr 24, 2019 •

edited

Loading

KasparoVy commented Apr 25, 2019 •

edited

Loading

Couls commented Jun 3, 2019 •

edited

Loading