Skip to content

Commit 63936f1

Browse files
burner1024burner1024
committed
combat.msg: add context to female PC lines, to decouple them from male ones, ref BGforgeNet/Fallout2_Restoration_Project#369 
1 parent efed5d1 commit 63936f1

1 file changed

Lines changed: 65 additions & 65 deletions

File tree

‎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
#

0 commit comments

Comments
 (0)