shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
kevinz000
2020-05-30 20:11:18 -07:00
parent 9d4d6e6b6f
commit e5c32c1746
5 changed files with 128 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/combat/attack_types.dm
+10
View File
@@ -11,3 +11,13 @@
#define ATTACK_TYPE_TACKLE (1<<4)
/// Attack was from a parry counterattack. Do not attempt to parry-this!
#define ATTACK_TYPE_PARRY_COUNTERATTACK (1<<5)
// Requires for datum definitions to not error with must be a constant statement when used in lists as text associative keys.
// KEEP IN SYNC WITH ABOVE!
#define TEXT_ATTACK_TYPE_MELEE 1
#define TEXT_ATTACK_TYPE_PROJECTILE 2
#define TEXT_ATTACK_TYPE_UNARMED 4
#define TEXT_ATTACK_TYPE_THROWN 8
#define TEXT_ATTACK_TYPE_TACKLE 16
#define TEXT_ATTACK_TYPE_PARRY_COUNTERATTACK 32
code/__DEFINES/combat/block_parry.dm
+5 -7
View File
@@ -46,13 +46,9 @@ GLOBAL_LIST_INIT(dir2blockdir, list(
#define PARRY_LOCK_ATTACKING (1<<2)
/// Parry effects.
/// List association must be one of the things underneath
#define PARRY_REFLEX_COUNTERATTACK "reflex_counter"
// Uses active_parry_reflex_counter() on the mob (if unarmed)/item/martial art used to parry.
#define PARRY_COUNTERATTACK_PROC "proc"
// Automatically melee attacks back normally, LMB equivalent action of an harm intent attack.
#define PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN "default"
/// No list association
/// Automatically melee attacks back normally, LMB equivalent action of an harm intent attack. List association should be defaulting to 1, being the attack damage multiplier for said counterattack
#define PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN "melee_counterattack_chain"
/// List association should be TRUE.
#define PARRY_DISARM_ATTACKER "disarm_attacker"
/// List association should be duration or null for just plain knockdown.
#define PARRY_KNOCKDOWN_ATTACKER "knockdown_attacker"
@@ -60,3 +56,5 @@ GLOBAL_LIST_INIT(dir2blockdir, list(
#define PARRY_STAGGER_ATTACKER "stagger_attacker"
/// List association should be amount of time to daze attacker.
#define PARRY_DAZE_ATTACKER "daze_attacker"
/// Set to TRUE in list association to ignore adjacency checks
#define PARRY_COUNTERATTACK_IGNORE_ADJACENCY "ignore_adjacency"