Skip to content

Commit dfdd60a

Browse files
NovaRainNovaRain
committed
Merge branch '2.4_Lite' into BGforge_RPU24
2 parents 08e686d + dadfbd0 commit dfdd60a

File tree

482 files changed

+9856
-4758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

482 files changed

+9856
-4758
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
pull_request:
66

77
env:
8-
sfall_version: 4.4.8
9-
mpack_version: 4.4.8
8+
sfall_version: 4.4.9
9+
mpack_version: 4.4.9
1010

1111
jobs:
1212
build:

‎data/proto/items/00000148.pro‎

69 Bytes
Binary file not shown.

‎data/proto/items/00000150.pro‎

69 Bytes
Binary file not shown.

‎data/proto/items/00000154.pro‎

69 Bytes
Binary file not shown.

‎data/proto/items/00000156.pro‎

69 Bytes
Binary file not shown.

‎data/text/czech/dialog/ectrappr.msg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{108}{}{Co nabízíš?}
1010
{109}{}{Zapomeň na to.}
1111
{110}{}{Eh.}
12-
{111}{}{Mám tohle: }
12+
{111}{}{Mám tohle:}
1313
{112}{}{kůží geckona.}
1414
{113}{}{kůží zlatého geckona.}
1515
{114}{}{Vezmu si všechno co máš.}

‎data/text/czech/game/combat.msg‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,29 @@
3030
{220}{}{náhodně zasáhla}
3131
{221}{}{jedna z jejích končetin byla zmrzačena}
3232
{222}{}{byla zasypána střepinami}
33-
{250}{}{byla knokautována}
34-
{251}{}{byla sražena k zemi}
35-
{252}{}{tvá levá noha byla zmrzačena}
36-
{253}{}{tvá pravá noha byla zmrzačena}
37-
{254}{}{tvá levá ruka byla zmrzačena}
38-
{255}{}{tvá pravá ruka byla zmrzačena}
39-
{256}{}{byla oslepena}
40-
{257}{}{byla jsi zabita}
41-
{258}{}{byla zasažena}
33+
{250}{female_pc}{knocked out}
34+
{251}{female_pc}{knocked down}
35+
{252}{female_pc}{crippled your left leg}
36+
{253}{female_pc}{crippled your right leg}
37+
{254}{female_pc}{crippled your left arm}
38+
{255}{female_pc}{crippled your right arm}
39+
{256}{female_pc}{blinded}
40+
{257}{female_pc}{were killed}
41+
{258}{female_pc}{hit}
4242
{259}{}{kriticky}
4343
{260}{}{v palbě}
44-
{261}{}{rána prošla tvou zbrojí}
45-
{262}{}{zbraň ti vybuchla v rukou}
46-
{263}{}{tvá zbraň byla zničena}
47-
{264}{}{zbraň ti upadla na zem}
48-
{265}{}{další tah se bude vzpamatovávat.}
49-
{266}{}{zasáhla jsi sama sebe}
50-
{267}{}{se ztrátou zbývající munice}
51-
{268}{}{vystřelila naprázdno}
52-
{269}{}{zranila jsi sama sebe}
53-
{270}{}{náhodně zasáhla}
54-
{271}{}{jedna z jejích končetin byla zmrzačena}
55-
{272}{}{byla zasypána střepinami}
44+
{261}{female_pc}{had your armor bypassed}
45+
{262}{female_pc}{your weapon exploded}
46+
{263}{female_pc}{destroyed your weapon}
47+
{264}{female_pc}{dropped your weapon}
48+
{265}{female_pc}{lost your next turn}
49+
{266}{female_pc}{hit yourself}
50+
{267}{female_pc}{lost the rest of your ammo}
51+
{268}{female_pc}{fired a dud shot}
52+
{269}{female_pc}{hurt yourself}
53+
{270}{female_pc}{hit randomly}
54+
{271}{female_pc}{crippled a random limb}
55+
{272}{female_pc}{peppered with fragments}
5656
{300}{}{byla knokautována}
5757
{301}{}{byla sražena k zemi}
5858
{302}{}{jeho levá noha byla zmrzačena}
@@ -76,15 +76,15 @@
7676
{320}{}{náhodně zasáhla}
7777
{321}{}{jedna z jejích končetin byla zmrzačena}
7878
{322}{}{byla zasypána střepinami}
79-
{400}{}{byla knokautována}
80-
{401}{}{byla sražena k zemi}
79+
{400}{female_npc}{knocked out}
80+
{401}{female_npc}{knocked down}
8181
{402}{}{její levá noha byla zmrzačena}
8282
{403}{}{její pravá noha byla zmrzačena}
8383
{404}{}{její levá ruka byla zmrzačena}
8484
{405}{}{její pravá ruka byla zmrzačena}
85-
{406}{}{byla oslepena}
86-
{407}{}{byl zabit}
87-
{408}{}{byla zasažena}
85+
{406}{female_npc}{blinded}
86+
{407}{female_npc}{was killed}
87+
{408}{female_npc}{hit}
8888
{409}{}{kriticky}
8989
{410}{}{v palbě}
9090
{411}{}{rána prošla její zbrojí}
@@ -94,11 +94,11 @@
9494
{415}{}{ztratila svůj další tah}
9595
{416}{}{zasáhla sama sebe}
9696
{417}{}{ztratila zbytek munice}
97-
{418}{}{vystřelila naprázdno}
97+
{418}{female_npc}{fired a dud shot}
9898
{419}{}{zranila sama sebe}
99-
{420}{}{náhodně zasáhla}
100-
{421}{}{jedna z jejích končetin byla zmrzačena}
101-
{422}{}{byla zasypána střepinami}
99+
{420}{female_npc}{hit randomly}
100+
{421}{female_npc}{crippled a random limb}
101+
{422}{female_npc}{peppered with fragments}
102102
{506}{}{Ty}
103103
{509}{}{Jejda! %s byl zasažen namísto cíle %s!}
104104
{511}{}{%s byl kriticky zasažen %s a ztratil %d bodů zdraví}
@@ -118,23 +118,23 @@
118118
{533}{}{%s nešikovně míjí a navíc se zraněním za1 hit bod}
119119
{534}{}{%s nešikovně míjí a navíc se zraněním za %d hit bodů}
120120
{556}{}{Ty}
121-
{559}{}{Jejda! %s byl zasažen namísto cíle %s!}
122-
{561}{}{%s byl kriticky zasažen %s a ztratil %d bodů zdraví}
123-
{562}{}{Zásah do: %s. Zasaženo: %s. Ztráta %d bodů zdraví}
124-
{563}{}{Cíl %s byl zasažen a ztratil %d bodů zdraví}
125-
{564}{}{%s: nešikovně míjí}
126-
{565}{}{%s míjí}
127-
{570}{}{%s byl kriticky zasažen a ztratil %d hit bodů}
128-
{571}{}{%s byla kriticky zasažena %s a ztratila 1 bod zdraví}
129-
{572}{}{%s byl zasažen %s a ztratila 1 bod zdraví}
130-
{573}{}{%s byl zasažen a ztratil 1 bod zdraví}
131-
{574}{}{%s byl kriticky zasažen a ztratil 1 bod zdraví}
132-
{575}{}{%s byl kriticky zasažen %s, ale útok nezpůsobil žádná zranění}
133-
{576}{}{% byl zasažen %s, ale útok nezpůsobil žádná zranění}
134-
{577}{}{%s byl zasažen, ale útok nezpůsobil žádná zranění}
135-
{578}{}{%s byl kriticky zasažen, ale útok nezpůsobil žádná zranění}
136-
{583}{}{%s nešikovně míjí a navíc se zraněním za1 hit bod}
137-
{584}{}{%s nešikovně míjí a navíc se zraněním za %d hit bodů}
121+
{559}{female_pc}{Oops! %s were hit instead of %s!}
122+
{561}{female_pc}{%s were critically hit in %s for %d hit points}
123+
{562}{female_pc}{%s were hit in %s for %d hit points}
124+
{563}{female_pc}{%s were hit for %d hit points}
125+
{564}{female_pc}{%s critically missed}
126+
{565}{female_pc}{%s missed}
127+
{570}{female_pc}{%s were critically hit for %d hit points}
128+
{571}{female_pc}{%s were critically hit in %s for 1 hit point}
129+
{572}{female_pc}{%s were hit in %s for 1 hit point}
130+
{573}{female_pc}{%s were hit for 1 hit point}
131+
{574}{female_pc}{%s were critically hit for 1 hit point}
132+
{575}{female_pc}{%s were critically hit in %s for no damage}
133+
{576}{female_pc}{%s were hit in %s for no damage}
134+
{577}{female_pc}{%s were hit for no damage}
135+
{578}{female_pc}{%s were critically hit for no damage}
136+
{583}{female_pc}{%s critically missed and took 1 hit point}
137+
{584}{female_pc}{%s critically missed and took %d hit points}
138138
{608}{}{Jejda! %s byl zasažen místo tebe!}
139139
{609}{}{Jejda! Mířeno do: %s. Zasaženo: %s!}
140140
{611}{}{Kritický zásah do: %s. Trefeno: %s. Ztráta %d hit bodů}
@@ -153,24 +153,24 @@
153153
{628}{}{Kritický zásah do: %s. Útok nezpůsobil žádné zranění.}
154154
{633}{}{%s nešikovně míjí a navíc se zraněním za1 hit bod}
155155
{634}{}{%s nešikovně míjí a navíc se zraněním za %d hit bodů}
156-
{708}{}{Jejda! %s byl zasažen místo tebe!}
157-
{709}{}{Jejda! Mířeno do: %s. Zasaženo: %s!}
158-
{711}{}{Kritický zásah do: %s. Trefeno: %s. Ztráta %d hit bodů}
159-
{712}{}{Zásah do: %s. Trefeno: %s. Ztráta %d hit bodů}
160-
{713}{}{Zásah do: %s se ztrátou %d hit bodů}
161-
{714}{}{%s: nešikovně míjí}
162-
{715}{}{%s míjí}
163-
{720}{}{Kritický zásah do: %s se ztrátou %d hit bodů}
164-
{721}{}{Kritický zásah do: %s se ztrátou 1 hit bodu. Místo zásahu: %s}
165-
{722}{}{Zásah do: %s se ztrátou 1 hit bodu. Místo zásahu: %s}
166-
{723}{}{Zásah do: %s se ztrátou 1 hit bodu}
167-
{724}{}{Kritický zásah do: %s se ztrátou 1 hit bodu}
168-
{725}{}{Kritický zásah do: %s. Útok nezpůsobil žádné zranění. Místo zásahu %s}
169-
{726}{}{Zásah do: %s. Útok nezpůsobil žádné zranění. Místo zásahu %s}
170-
{727}{}{Zásah do: %s. Útok nezpůsobil žádné zranění}
171-
{728}{}{Kritický zásah do: %s. Útok nezpůsobil žádné zranění.}
172-
{733}{}{%s nešikovně míjí a navíc se zraněním za1 hit bod}
173-
{734}{}{%s nešikovně míjí a navíc se zraněním za %d hit bodů}
156+
{708}{female_npc}{Oops! %s was hit instead of you!}
157+
{709}{female_npc}{Oops! %s was hit instead of %s!}
158+
{711}{female_npc}{%s was critically hit in %s for %d hit points}
159+
{712}{female_npc}{%s was hit in %s for %d hit points}
160+
{713}{female_npc}{%s was hit for %d hit points}
161+
{714}{female_npc}{%s critically missed}
162+
{715}{female_npc}{%s missed}
163+
{720}{female_npc}{%s was critically hit for %d hit points}
164+
{721}{female_npc}{%s was critically hit in %s for 1 hit point}
165+
{722}{female_npc}{%s was hit in %s for 1 hit point}
166+
{723}{female_npc}{%s was hit for 1 hit point}
167+
{724}{female_npc}{%s was critically hit for 1 hit point}
168+
{725}{female_npc}{%s was critically hit in %s for no damage}
169+
{726}{female_npc}{%s was hit in %s for no damage}
170+
{727}{female_npc}{%s was hit for no damage}
171+
{728}{female_npc}{%s was critically hit for no damage}
172+
{733}{female_npc}{%s critically missed and took 1 hit point}
173+
{734}{female_npc}{%s critically missed and took %d hit points}
174174
{1110}{}{do hlavy}
175175
{1111}{}{do levý ruky}
176176
{1112}{}{do pravý ruky}

‎data/text/english/dialog/ectrappr.msg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{100}{}{You see a dirty, unshaven man.}
22
{200}{}{You see a dirty, haggard woman.}
33
{101}{}{Trapper.}
4-
{102}{}{Best not get too close. Some of the critters in his clothes might be looking for a cleaner
4+
{102}{}{Best not get too close. Some of the critters in those clothes might be looking for a cleaner
55
home.}
66
{103}{}{Howdy. Don't come across people too often out here in trapper country. Whatcha want?}
77
{104}{}{Do you have any gecko pelts for sale?}
@@ -12,7 +12,7 @@
1212
{108}{}{What do you have?}
1313
{109}{}{Never mind.}
1414
{110}{}{Ug.}
15-
{111}{}{Here's what I got: }
15+
{111}{}{Here's what I got:}
1616
{112}{}{regular gecko pelts.}
1717
{113}{}{golden gecko pelts.}
1818
{114}{}{I'll take all you got.}

‎data/text/english/game/combat.msg‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -42,29 +42,29 @@
4242
#
4343
# Combat Flag Strings (all of these happen to you, the FEMALE player)
4444
#
45-
{250}{}{knocked out}
46-
{251}{}{knocked down}
47-
{252}{}{crippled your left leg}
48-
{253}{}{crippled your right leg}
49-
{254}{}{crippled your left arm}
50-
{255}{}{crippled your right arm}
51-
{256}{}{blinded}
52-
{257}{}{were killed}
53-
{258}{}{hit}
45+
{250}{female_pc}{knocked out}
46+
{251}{female_pc}{knocked down}
47+
{252}{female_pc}{crippled your left leg}
48+
{253}{female_pc}{crippled your right leg}
49+
{254}{female_pc}{crippled your left arm}
50+
{255}{female_pc}{crippled your right arm}
51+
{256}{female_pc}{blinded}
52+
{257}{female_pc}{were killed}
53+
{258}{female_pc}{hit}
5454
{259}{}{critical}
5555
{260}{}{on fire}
56-
{261}{}{had your armor bypassed}
57-
{262}{}{your weapon exploded}
58-
{263}{}{destroyed your weapon}
59-
{264}{}{dropped your weapon}
60-
{265}{}{lost your next turn}
61-
{266}{}{hit yourself}
62-
{267}{}{lost the rest of your ammo}
63-
{268}{}{fired a dud shot}
64-
{269}{}{hurt yourself}
65-
{270}{}{hit randomly}
66-
{271}{}{crippled a random limb}
67-
{272}{}{peppered with fragments}
56+
{261}{female_pc}{had your armor bypassed}
57+
{262}{female_pc}{your weapon exploded}
58+
{263}{female_pc}{destroyed your weapon}
59+
{264}{female_pc}{dropped your weapon}
60+
{265}{female_pc}{lost your next turn}
61+
{266}{female_pc}{hit yourself}
62+
{267}{female_pc}{lost the rest of your ammo}
63+
{268}{female_pc}{fired a dud shot}
64+
{269}{female_pc}{hurt yourself}
65+
{270}{female_pc}{hit randomly}
66+
{271}{female_pc}{crippled a random limb}
67+
{272}{female_pc}{peppered with fragments}
6868
#
6969
# Combat Flag Strings (all of these happen to a male)
7070
#
@@ -94,15 +94,15 @@
9494
#
9595
# Combat Flag Strings (all of these happen to a female)
9696
#
97-
{400}{}{knocked out}
98-
{401}{}{knocked down}
97+
{400}{female_npc}{knocked out}
98+
{401}{female_npc}{knocked down}
9999
{402}{}{crippled her left leg}
100100
{403}{}{crippled her right leg}
101101
{404}{}{crippled her left arm}
102102
{405}{}{crippled her right arm}
103-
{406}{}{blinded}
104-
{407}{}{was killed}
105-
{408}{}{hit}
103+
{406}{female_npc}{blinded}
104+
{407}{female_npc}{was killed}
105+
{408}{female_npc}{hit}
106106
{409}{}{critical}
107107
{410}{}{on fire}
108108
{411}{}{had her armor bypassed}
@@ -112,11 +112,11 @@
112112
{415}{}{lost her next turn}
113113
{416}{}{hit herself}
114114
{417}{}{lost the rest of her ammo}
115-
{418}{}{fired a dud shot}
115+
{418}{female_npc}{fired a dud shot}
116116
{419}{}{hurt herself}
117-
{420}{}{hit randomly}
118-
{421}{}{crippled a random limb}
119-
{422}{}{peppered with fragments}
117+
{420}{female_npc}{hit randomly}
118+
{421}{female_npc}{crippled a random limb}
119+
{422}{female_npc}{peppered with fragments}
120120
#
121121
# Miscellaneous combat messages (all of these happen to you, the male player)
122122
# Note: the first %s will be replaced by the value of line 506, which
@@ -156,23 +156,23 @@
156156
# in the 1000's in this file, with the exception of line 559
157157
# where the second %s is the name of another creature
158158
{556}{}{You}
159-
{559}{}{Oops! %s were hit instead of %s!}
160-
{561}{}{%s were critically hit in %s for %d hit points}
161-
{562}{}{%s were hit in %s for %d hit points}
162-
{563}{}{%s were hit for %d hit points}
163-
{564}{}{%s critically missed}
164-
{565}{}{%s missed}
165-
{570}{}{%s were critically hit for %d hit points}
166-
{571}{}{%s were critically hit in %s for 1 hit point}
167-
{572}{}{%s were hit in %s for 1 hit point}
168-
{573}{}{%s were hit for 1 hit point}
169-
{574}{}{%s were critically hit for 1 hit point}
170-
{575}{}{%s were critically hit in %s for no damage}
171-
{576}{}{%s were hit in %s for no damage}
172-
{577}{}{%s were hit for no damage}
173-
{578}{}{%s were critically hit for no damage}
174-
{583}{}{%s critically missed and took 1 hit point}
175-
{584}{}{%s critically missed and took %d hit points}
159+
{559}{female_pc}{Oops! %s were hit instead of %s!}
160+
{561}{female_pc}{%s were critically hit in %s for %d hit points}
161+
{562}{female_pc}{%s were hit in %s for %d hit points}
162+
{563}{female_pc}{%s were hit for %d hit points}
163+
{564}{female_pc}{%s critically missed}
164+
{565}{female_pc}{%s missed}
165+
{570}{female_pc}{%s were critically hit for %d hit points}
166+
{571}{female_pc}{%s were critically hit in %s for 1 hit point}
167+
{572}{female_pc}{%s were hit in %s for 1 hit point}
168+
{573}{female_pc}{%s were hit for 1 hit point}
169+
{574}{female_pc}{%s were critically hit for 1 hit point}
170+
{575}{female_pc}{%s were critically hit in %s for no damage}
171+
{576}{female_pc}{%s were hit in %s for no damage}
172+
{577}{female_pc}{%s were hit for no damage}
173+
{578}{female_pc}{%s were critically hit for no damage}
174+
{583}{female_pc}{%s critically missed and took 1 hit point}
175+
{584}{female_pc}{%s critically missed and took %d hit points}
176176
#
177177
# Miscellaneous combat messages (all of these happen to a male)
178178
# Note: the first %s is the name of the male creature
@@ -207,24 +207,24 @@
207207
# in the 1000's in this file, with the exception of line 709
208208
# where the second %s is the name of another creature
209209
#
210-
{708}{}{Oops! %s was hit instead of you!}
211-
{709}{}{Oops! %s was hit instead of %s!}
212-
{711}{}{%s was critically hit in %s for %d hit points}
213-
{712}{}{%s was hit in %s for %d hit points}
214-
{713}{}{%s was hit for %d hit points}
215-
{714}{}{%s critically missed}
216-
{715}{}{%s missed}
217-
{720}{}{%s was critically hit for %d hit points}
218-
{721}{}{%s was critically hit in %s for 1 hit point}
219-
{722}{}{%s was hit in %s for 1 hit point}
220-
{723}{}{%s was hit for 1 hit point}
221-
{724}{}{%s was critically hit for 1 hit point}
222-
{725}{}{%s was critically hit in %s for no damage}
223-
{726}{}{%s was hit in %s for no damage}
224-
{727}{}{%s was hit for no damage}
225-
{728}{}{%s was critically hit for no damage}
226-
{733}{}{%s critically missed and took 1 hit point}
227-
{734}{}{%s critically missed and took %d hit points}
210+
{708}{female_npc}{Oops! %s was hit instead of you!}
211+
{709}{female_npc}{Oops! %s was hit instead of %s!}
212+
{711}{female_npc}{%s was critically hit in %s for %d hit points}
213+
{712}{female_npc}{%s was hit in %s for %d hit points}
214+
{713}{female_npc}{%s was hit for %d hit points}
215+
{714}{female_npc}{%s critically missed}
216+
{715}{female_npc}{%s missed}
217+
{720}{female_npc}{%s was critically hit for %d hit points}
218+
{721}{female_npc}{%s was critically hit in %s for 1 hit point}
219+
{722}{female_npc}{%s was hit in %s for 1 hit point}
220+
{723}{female_npc}{%s was hit for 1 hit point}
221+
{724}{female_npc}{%s was critically hit for 1 hit point}
222+
{725}{female_npc}{%s was critically hit in %s for no damage}
223+
{726}{female_npc}{%s was hit in %s for no damage}
224+
{727}{female_npc}{%s was hit for no damage}
225+
{728}{female_npc}{%s was critically hit for no damage}
226+
{733}{female_npc}{%s critically missed and took 1 hit point}
227+
{734}{female_npc}{%s critically missed and took %d hit points}
228228
#
229229
# Hit Locations (by art_num alias)
230230
#

‎data/text/french/dialog/newr1.msg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
{462}{}{Bernard Froideure}
172172
{463}{}{Anne Halle}
173173
{464}{}{La Poisse}
174-
{465}{made_man_name}{Tank}
174+
{465}{made_man_name}{Le Char}
175175
{466}{}{La Châtaigne}
176176
{467}{}{Coquine}
177177
{468}{}{L'Alligator}

0 commit comments

Comments
 (0)