Skip to content

Commit 8ff7f9a

Browse files
OSXLich-DougOSXLich-Doug
authored
Merge pull request #678 from elanthia-online/staging
push staging into master for Lich 5.10.3
2 parents d8bc392 + 996af16 commit 8ff7f9a

19 files changed

+194
-289
lines changed

‎R4LGTK3.iss

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
; to support the Lich scripting environment for Simutronics games
44

55
#define MyAppName "Ruby4Lich5"
6-
#define MyAppVersion "5.10.2"
6+
#define MyAppVersion "5.10.3"
77
#define RubyVersion "3.3.4"
88
#define MyAppPublisher "Elanthia-Online"
99
#define MyAppURL "https://github.com/elanthia-online/lich-5/"
@@ -12,7 +12,7 @@
1212
[Setup]
1313
; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
1414
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
15-
AppId= {{edd9ccd7-33cb-4577-a470-fe8fd087eaee}
15+
AppId= {{edd9ccd7-33cb-4577-a470-fe8fd087eaef}
1616
AppName={#MyAppName}
1717
AppVersion={#MyAppVersion}
1818
AppVerName={#MyAppName} Ruby {#RubyVersion} & Lich {#MyAppVersion}

‎lib/attributes/spellsong.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Spellsong
88
def self.sync
99
timed_spell = Effects::Spells.to_h.keys.find { |k| k.to_s.match(/10[0-9][0-9]/) }
1010
return 'No active bard spells' if timed_spell.nil?
11-
@@renewed = Time.at(Time.now.to_f - self.duration.to_f + (Effects::Spells.time_left(timed_spell) * 60.to_f))
11+
@@renewed = Time.at(Time.now.to_f - self.timeleft.to_f + (Effects::Spells.time_left(timed_spell) * 60.to_f))
1212
end
1313

1414
def self.renewed

‎lib/crit_tables/acid_critical_table.rb

+17-188
Large diffs are not rendered by default.

‎lib/crit_tables/cold_critical_table.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ module CritRanks
341341
:wound_rank => 3,
342342
:secondary_wound => nil,
343343
:regex =>
344-
/Icy blast to neck freezes .*?'s words in mid\-speech and leaves it speechless./ },
344+
/Icy blast to neck freezes .*?'s words in mid\-speech and leaves (?:her|him|it) speechless\.\.\.permanently./ },
345345
7 =>
346346
{ :type => "Cold",
347347
:location => "Neck",

‎lib/crit_tables/fire_critical_table.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ module CritRanks
124124
:slowed => false,
125125
:wound_rank => 3,
126126
:secondary_wound => nil,
127-
:regex => /Flames incinerate scalp completely and blacken scullcap./ },
127+
:regex => /Flames incinerate scalp completely and blacken skullcap. Not very fashionable./ },
128128
6 =>
129129
{ :type => "Fire",
130130
:location => "Head",
@@ -297,7 +297,7 @@ module CritRanks
297297
:slowed => false,
298298
:wound_rank => 2,
299299
:secondary_wound => nil,
300-
:regex => /Flames incinerate muscle tissue in neck exposing trachea./ },
300+
:regex => /Flames incinerate muscle tissue in neck exposing the trachea. More than you ever wanted to see./ },
301301
5 =>
302302
{ :type => "Fire",
303303
:location => "Neck",
@@ -355,7 +355,7 @@ module CritRanks
355355
:wound_rank => 3,
356356
:secondary_wound => nil,
357357
:regex =>
358-
/A .*? takes a breath of super\-heated air and expires gasping./ },
358+
/.*? takes a breath of super\-heated air and expires gasping./ },
359359
8 =>
360360
{ :type => "Fire",
361361
:location => "Neck",
@@ -1143,7 +1143,7 @@ module CritRanks
11431143
:wound_rank => 3,
11441144
:secondary_wound => nil,
11451145
:regex =>
1146-
/Intestines rupture from intense heat; dies a slow, painful death./ },
1146+
/Intestines rupture from intense heat; .*? dies a slow, painful death./ },
11471147
9 =>
11481148
{ :type => "Fire",
11491149
:location => "Abdomen",

‎lib/crit_tables/grapple_critical_table.rb

+14-14
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ module CritRanks
144144
:wound_rank => 3,
145145
:secondary_wound => nil,
146146
:regex =>
147-
/(?:.*?'s h|H)ead is cracked as (?:it|she|he is thrown|you throw .*?) to the ground./ },
147+
/(?:.*?'s h|H)ead (?:is )?cracked as (?:it|she|he is thrown|you throw .*?) to the ground./ },
148148
8 =>
149149
{ :type => "Grapple",
150150
:location => "Head",
@@ -182,7 +182,7 @@ module CritRanks
182182
:slowed => false,
183183
:wound_rank => 3,
184184
:secondary_wound => nil,
185-
:regex => /Head crushed! Resulting death is... messy./ } },
185+
:regex => /Head crushed. Resulting death is... messy./ } },
186186
:neck =>
187187
{ 1 =>
188188
{ :type => "Grapple",
@@ -317,7 +317,7 @@ module CritRanks
317317
:wound_rank => 3,
318318
:secondary_wound => nil,
319319
:regex =>
320-
/Grab to the head sprains .*?'s neck badly before it hits the ground./ },
320+
/Grab to the head sprains .*?'s neck badly before (?:he|she|it) hits the ground./ },
321321
8 =>
322322
{ :type => "Grapple",
323323
:location => "Neck",
@@ -394,7 +394,7 @@ module CritRanks
394394
:slowed => false,
395395
:wound_rank => 0,
396396
:secondary_wound => nil,
397-
:regex => /Weak eye gouge, probably distracting./ },
397+
:regex => /Weak eye gouge, (?:probably distracting|you may have .*?'s attention now)./ },
398398
2 =>
399399
{ :type => "Grapple",
400400
:location => "Left eye",
@@ -470,7 +470,7 @@ module CritRanks
470470
:slowed => false,
471471
:wound_rank => 1,
472472
:secondary_wound => nil,
473-
:regex => /Dirt gets in .*?'s eyes as it is pushed to the ground./ },
473+
:regex => /Dirt gets in .*?'s eyes as (?:she|he|it) is pushed to the ground./ },
474474
6 =>
475475
{ :type => "Grapple",
476476
:location => "Left eye",
@@ -605,7 +605,7 @@ module CritRanks
605605
:slowed => false,
606606
:wound_rank => 1,
607607
:secondary_wound => nil,
608-
:regex => /Solid chest grapple, a .*? is winded./ },
608+
:regex => /Solid chest grapple, .*? is winded./ },
609609
4 =>
610610
{ :type => "Grapple",
611611
:location => "Chest",
@@ -643,7 +643,7 @@ module CritRanks
643643
:slowed => false,
644644
:wound_rank => 1,
645645
:secondary_wound => nil,
646-
:regex => /Hard blow to chest knocks .*? back and winds it./ },
646+
:regex => /Hard blow to chest knocks .*? back and winds (?:it|him|her)./ },
647647
6 =>
648648
{ :type => "Grapple",
649649
:location => "Chest",
@@ -815,7 +815,7 @@ module CritRanks
815815
:slowed => false,
816816
:wound_rank => 1,
817817
:secondary_wound => nil,
818-
:regex => /Hard blow to stomach knocks .*? back and winds it./ },
818+
:regex => /Hard blow to stomach knocks .*? back and winds (?:her|him|it)./ },
819819
6 =>
820820
{ :type => "Grapple",
821821
:location => "Abdomen",
@@ -1085,7 +1085,7 @@ module CritRanks
10851085
:slowed => false,
10861086
:wound_rank => 1,
10871087
:secondary_wound => nil,
1088-
:regex => /Fierce arm lock twists a .*?'s right arm./ },
1088+
:regex => /Fierce arm lock twists an? .*?'s right arm./ },
10891089
7 =>
10901090
{ :type => "Grapple",
10911091
:location => "Right arm",
@@ -1432,7 +1432,7 @@ module CritRanks
14321432
:wound_rank => 1,
14331433
:secondary_wound => nil,
14341434
:regex =>
1435-
/.*?'s left hand is wrenched hard as (?:it|she|he) is thrown to the ground./ },
1435+
/(?:.*?'s l|L)eft hand (?:is )?wrenched hard as (?:she|he|it|opponent) is thrown to the ground./ },
14361436
8 =>
14371437
{ :type => "Grapple",
14381438
:location => "Left hand",
@@ -1491,7 +1491,7 @@ module CritRanks
14911491
:wound_rank => 1,
14921492
:secondary_wound => nil,
14931493
:regex =>
1494-
/.*?'s right hand is wrenched hard as she is thrown to the ground./ } },
1494+
/(?:.*?'s r|R)ight hand (?:is )?wrenched hard as (?:she|he|it|opponent) is thrown to the ground./ } },
14951495
:left_leg =>
14961496
{ 1 =>
14971497
{ :type => "Grapple",
@@ -1549,7 +1549,7 @@ module CritRanks
15491549
:slowed => false,
15501550
:wound_rank => 1,
15511551
:secondary_wound => nil,
1552-
:regex => /Leg sweep keeps a .*?'s feet overhead./ },
1552+
:regex => /Leg sweep keeps .*?'s feet overhead./ },
15531553
4 =>
15541554
{ :type => "Grapple",
15551555
:location => "Left leg",
@@ -1626,7 +1626,7 @@ module CritRanks
16261626
:wound_rank => 1,
16271627
:secondary_wound => nil,
16281628
:regex =>
1629-
/(?:.*?'s l|L)eft leg is wrenched hard as (?:she|he|it|opponent) is thrown to the ground./ },
1629+
/(?:.*?'s l|L)eft leg (?:is )?wrenched hard as (?:she|he|it|opponent) is thrown to the ground./ },
16301630
8 =>
16311631
{ :type => "Grapple",
16321632
:location => "Left leg",
@@ -1704,7 +1704,7 @@ module CritRanks
17041704
:wound_rank => 1,
17051705
:secondary_wound => nil,
17061706
:regex =>
1707-
/(?:.*?'s r|R)ight leg is wrenched hard as (?:she|he|it|opponent) is thrown to the ground./ },
1707+
/(?:.*?'s r|R)ight leg (?:is )?wrenched hard as (?:she|he|it|opponent) is thrown to the ground./ },
17081708
8 =>
17091709
{ :type => "Grapple",
17101710
:location => "Right leg",

‎lib/crit_tables/lightning_critical_table.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -2540,7 +2540,7 @@ module CritRanks
25402540
:slowed => false,
25412541
:wound_rank => 1,
25422542
:secondary_wound => nil,
2543-
:regex => /Mild electrical jolt sends .*? into spasms./ },
2543+
:regex => /Mild electric(?:al)? jolt sends .*? into spasms./ },
25442544
2 =>
25452545
{ :type => "Lightning",
25462546
:location => "Nerves",
@@ -2616,7 +2616,7 @@ module CritRanks
26162616
:slowed => false,
26172617
:wound_rank => 3,
26182618
:secondary_wound => nil,
2619-
:regex => /Electrical blast goes right to the heart./ },
2619+
:regex => /Electric blast goes right to the heart. Fibrillation can be fun./ },
26202620
6 =>
26212621
{ :type => "Lightning",
26222622
:location => "Nerves",

‎lib/crit_tables/non_corporeal_critical_table.rb

+9-9
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ module CritRanks
206206
:wound_rank => 0,
207207
:secondary_wound => nil,
208208
:regex =>
209-
/Strong attack separates head from shoulders. Head disappears in the breeze as a new one forms on .*?'s shoulders./ } },
209+
/Head disappears in the breeze as a new one forms on .*?'s shoulders./ } },
210210
:neck =>
211211
{ 0 =>
212212
{ :type => "Non-corporeal",
@@ -266,7 +266,7 @@ module CritRanks
266266
:slowed => false,
267267
:wound_rank => 0,
268268
:secondary_wound => nil,
269-
:regex => /Flashy attack passes through the side of the neck. Ethereal fluids spray forth and quickly vanish into vapor./ },
269+
:regex => /Ethereal fluids spray forth and quickly vanish into vapor./ },
270270
3 =>
271271
{ :type => "Non-corporeal",
272272
:location => "Neck",
@@ -285,7 +285,7 @@ module CritRanks
285285
:slowed => false,
286286
:wound_rank => 0,
287287
:secondary_wound => nil,
288-
:regex => /Smoky tendrils rise from neck as (?:your|the) attack sweeps through./ },
288+
:regex => /Smoky tendrils rise from (?:.*?)?neck as (?:your|the) attack sweeps through./ },
289289
4 =>
290290
{ :type => "Non-corporeal",
291291
:location => "Neck",
@@ -325,7 +325,7 @@ module CritRanks
325325
:wound_rank => 0,
326326
:secondary_wound => nil,
327327
:regex =>
328-
/Strong attack rips through the neck! To your horror, .*?'s substance flows around the wound without leaving a trace./ },
328+
/To your horror, .*?'s substance flows around the wound without leaving a trace./ },
329329
6 =>
330330
{ :type => "Non-corporeal",
331331
:rank => 6,
@@ -344,7 +344,7 @@ module CritRanks
344344
:wound_rank => 0,
345345
:secondary_wound => nil,
346346
:regex =>
347-
/.*? wails eerily as your blow passes through (?:its|her|his) vocal cords./ },
347+
/.*? wails eerily as (?:your|the) blow passes through (?:its|her|his) vocal cords./ },
348348
7 =>
349349
{ :type => "Non-corporeal",
350350
:location => "Neck",
@@ -384,7 +384,7 @@ module CritRanks
384384
:wound_rank => 0,
385385
:secondary_wound => nil,
386386
:regex =>
387-
/Brutal blow to the neck sends head flying. The head floats up and settles back in place as easily as a hat. What is this, a haberdashery./ },
387+
/The head floats up and settles back in place as easily as a hat./ },
388388
9 =>
389389
{ :type => "Non-corporeal",
390390
:location => "Neck",
@@ -403,7 +403,7 @@ module CritRanks
403403
:slowed => false,
404404
:wound_rank => 0,
405405
:secondary_wound => nil,
406-
:regex => /Tremendous strike. Vapor rushes from the neck following the blow./ } },
406+
:regex => /Vapor rushes from the neck following the blow./ } },
407407
:right_eye =>
408408
{ 0 =>
409409
{ :type => "Non-corporeal",
@@ -1449,7 +1449,7 @@ module CritRanks
14491449
:wound_rank => 0,
14501450
:secondary_wound => nil,
14511451
:regex =>
1452-
/Good hit. Right shoulder is ripped from (?:its|her|his) socket, then wriggles back into place./ },
1452+
/Right shoulder is ripped from (?:its|her|his) socket,? then wriggles back into place./ },
14531453
7 =>
14541454
{ :type => "Non-corporeal",
14551455
:location => "Right arm",
@@ -1625,7 +1625,7 @@ module CritRanks
16251625
:wound_rank => 0,
16261626
:secondary_wound => nil,
16271627
:regex =>
1628-
/Good hit. Left shoulder is ripped from (?:its|her|his) socket, then wriggles back into place./ },
1628+
/Left shoulder is ripped from (?:its|her|his) socket,? then wriggles back into place./ },
16291629
6 =>
16301630
{ :type => "Non-corporeal",
16311631
:location => "Left arm",

0 commit comments

Comments
 (0)