From 76e7e00941c836e873d548bb312484c2dd83befd Mon Sep 17 00:00:00 2001 From: desertkaz Date: Mon, 2 Dec 2024 22:25:57 -0700 Subject: [PATCH 1/2] [script][combat-trainer]add marble to ammo pattern Droughtman 450 introduced marbles as sling ammo --- combat-trainer.lic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/combat-trainer.lic b/combat-trainer.lic index 5e021c0a58..18d486d87f 100644 --- a/combat-trainer.lic +++ b/combat-trainer.lic @@ -3395,7 +3395,7 @@ class AttackProcess # Monitor for ammo falling to ground after firing your ranged weapon. # Tests: https://regex101.com/r/HkIa8j/1 # IMPORTANT: 'stone shard' must be listed before 'shard' and 'stone' in the pattern else won't match 'senci stone shard' correctly. - ammo_pattern = "(?arrow|bolt|stone shard|shard|rock|sphere|clump|coral|fist|holder|lump|patella|pellet|pulzone|quadrello|quarrel|quill|stone|stopper|verretto|blowgun dart|crumb|spine|mantrap spike|tiny dragon|icicle|fang|scale|grey-black spike|bacon strip|page|naga|thorn|fragment|talon|cork|button|core|pebble|geode|stub|pit|thimble|doorknob|cone|bell|hunk|piece|present|sleighbell|sprig|star|toy|spiral)s?" + ammo_pattern = "(?arrow|bolt|stone shard|shard|rock|sphere|clump|coral|fist|holder|lump|patella|pellet|pulzone|quadrello|quarrel|quill|stone|stopper|verretto|blowgun dart|crumb|spine|mantrap spike|tiny dragon|icicle|fang|scale|grey-black spike|bacon strip|page|naga|thorn|fragment|talon|cork|button|core|pebble|geode|stub|pit|thimble|doorknob|cone|bell|hunk|piece|present|sleighbell|sprig|star|toy|spiral|marble)s?" Flags.add('ct-ranged-ammo', "(you (?fire|poach|snipe) an?|your) (?[^\.!]*? )?#{ammo_pattern}(?.*)?(? [^\.!]*?)?? (at|passes through)") Flags.add('ct-powershot-ammo', "With a loud twang, you let fly your #{ammo_pattern}!") Flags.add('ct-ranged-loaded', 'You reach into', 'You load', 'You carefully load', 'already loaded', 'in your hand') From b74bc32275972a46a1a21f79a156c6c053b57d08 Mon Sep 17 00:00:00 2001 From: desertkaz Date: Mon, 2 Dec 2024 22:33:37 -0700 Subject: [PATCH 2/2] add tile also Saw an issue that mentioned tile was also missing. --- combat-trainer.lic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/combat-trainer.lic b/combat-trainer.lic index 18d486d87f..b6698a7976 100644 --- a/combat-trainer.lic +++ b/combat-trainer.lic @@ -3395,7 +3395,7 @@ class AttackProcess # Monitor for ammo falling to ground after firing your ranged weapon. # Tests: https://regex101.com/r/HkIa8j/1 # IMPORTANT: 'stone shard' must be listed before 'shard' and 'stone' in the pattern else won't match 'senci stone shard' correctly. - ammo_pattern = "(?arrow|bolt|stone shard|shard|rock|sphere|clump|coral|fist|holder|lump|patella|pellet|pulzone|quadrello|quarrel|quill|stone|stopper|verretto|blowgun dart|crumb|spine|mantrap spike|tiny dragon|icicle|fang|scale|grey-black spike|bacon strip|page|naga|thorn|fragment|talon|cork|button|core|pebble|geode|stub|pit|thimble|doorknob|cone|bell|hunk|piece|present|sleighbell|sprig|star|toy|spiral|marble)s?" + ammo_pattern = "(?arrow|bolt|stone shard|shard|rock|sphere|clump|coral|fist|holder|lump|patella|pellet|pulzone|quadrello|quarrel|quill|stone|stopper|verretto|blowgun dart|crumb|spine|mantrap spike|tiny dragon|icicle|fang|scale|grey-black spike|bacon strip|page|naga|thorn|fragment|talon|cork|button|core|pebble|geode|stub|pit|thimble|doorknob|cone|bell|hunk|piece|present|sleighbell|sprig|star|toy|spiral|tile|marble)s?" Flags.add('ct-ranged-ammo', "(you (?fire|poach|snipe) an?|your) (?[^\.!]*? )?#{ammo_pattern}(?.*)?(? [^\.!]*?)?? (at|passes through)") Flags.add('ct-powershot-ammo', "With a loud twang, you let fly your #{ammo_pattern}!") Flags.add('ct-ranged-loaded', 'You reach into', 'You load', 'You carefully load', 'already loaded', 'in your hand')