Merge pull request #659 from Citadel-Station-13/upstream-merge-26687
[MIRROR] Moves config/names to strings/names
This commit is contained in:
@@ -1,23 +1,23 @@
|
|||||||
GLOBAL_LIST_INIT(ai_names, world.file2list("config/names/ai.txt"))
|
GLOBAL_LIST_INIT(ai_names, world.file2list("strings/names/ai.txt"))
|
||||||
GLOBAL_LIST_INIT(wizard_first, world.file2list("config/names/wizardfirst.txt"))
|
GLOBAL_LIST_INIT(wizard_first, world.file2list("strings/names/wizardfirst.txt"))
|
||||||
GLOBAL_LIST_INIT(wizard_second, world.file2list("config/names/wizardsecond.txt"))
|
GLOBAL_LIST_INIT(wizard_second, world.file2list("strings/names/wizardsecond.txt"))
|
||||||
GLOBAL_LIST_INIT(ninja_titles, world.file2list("config/names/ninjatitle.txt"))
|
GLOBAL_LIST_INIT(ninja_titles, world.file2list("strings/names/ninjatitle.txt"))
|
||||||
GLOBAL_LIST_INIT(ninja_names, world.file2list("config/names/ninjaname.txt"))
|
GLOBAL_LIST_INIT(ninja_names, world.file2list("strings/names/ninjaname.txt"))
|
||||||
GLOBAL_LIST_INIT(commando_names, world.file2list("config/names/death_commando.txt"))
|
GLOBAL_LIST_INIT(commando_names, world.file2list("strings/names/death_commando.txt"))
|
||||||
GLOBAL_LIST_INIT(first_names_male, world.file2list("config/names/first_male.txt"))
|
GLOBAL_LIST_INIT(first_names_male, world.file2list("strings/names/first_male.txt"))
|
||||||
GLOBAL_LIST_INIT(first_names_female, world.file2list("config/names/first_female.txt"))
|
GLOBAL_LIST_INIT(first_names_female, world.file2list("strings/names/first_female.txt"))
|
||||||
GLOBAL_LIST_INIT(last_names, world.file2list("config/names/last.txt"))
|
GLOBAL_LIST_INIT(last_names, world.file2list("strings/names/last.txt"))
|
||||||
GLOBAL_LIST_INIT(lizard_names_male, world.file2list("config/names/lizard_male.txt"))
|
GLOBAL_LIST_INIT(lizard_names_male, world.file2list("strings/names/lizard_male.txt"))
|
||||||
GLOBAL_LIST_INIT(lizard_names_female, world.file2list("config/names/lizard_female.txt"))
|
GLOBAL_LIST_INIT(lizard_names_female, world.file2list("strings/names/lizard_female.txt"))
|
||||||
GLOBAL_LIST_INIT(clown_names, world.file2list("config/names/clown.txt"))
|
GLOBAL_LIST_INIT(clown_names, world.file2list("strings/names/clown.txt"))
|
||||||
GLOBAL_LIST_INIT(mime_names, world.file2list("config/names/mime.txt"))
|
GLOBAL_LIST_INIT(mime_names, world.file2list("strings/names/mime.txt"))
|
||||||
GLOBAL_LIST_INIT(carp_names, world.file2list("config/names/carp.txt"))
|
GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt"))
|
||||||
GLOBAL_LIST_INIT(golem_names, world.file2list("config/names/golem.txt"))
|
GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt"))
|
||||||
GLOBAL_LIST_INIT(plasmaman_names, world.file2list("config/names/plasmaman.txt"))
|
GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt"))
|
||||||
GLOBAL_LIST_INIT(posibrain_names, list("PBU","HIU","SINA","ARMA","OSI","HBL","MSO","RR","CHRI","CDB","HG","XSI","ORNG","GUN","KOR","MET","FRE","XIS","SLI","PKP","HOG","RZH","GOOF","MRPR","JJR","FIRC","INC","PHL","BGB","ANTR","MIW","WJ","JRD","CHOC","ANCL","JLLO","JNLG","KOS","TKRG","XAL","STLP","CBOS","DUNC","FXMC","DRSD","COI"))
|
GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt"))
|
||||||
|
|
||||||
|
|
||||||
GLOBAL_LIST_INIT(verbs, world.file2list("config/names/verbs.txt"))
|
GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt"))
|
||||||
GLOBAL_LIST_INIT(adjectives, world.file2list("config/names/adjectives.txt"))
|
GLOBAL_LIST_INIT(adjectives, world.file2list("strings/names/adjectives.txt"))
|
||||||
//loaded on startup because of "
|
//loaded on startup because of "
|
||||||
//would include in rsc if ' was used
|
//would include in rsc if ' was used
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
PBU
|
||||||
|
HIU
|
||||||
|
SINA
|
||||||
|
ARMA
|
||||||
|
OSI
|
||||||
|
HBL
|
||||||
|
MSO
|
||||||
|
RR
|
||||||
|
CHRI
|
||||||
|
CDB
|
||||||
|
HG
|
||||||
|
XSI
|
||||||
|
ORNG
|
||||||
|
GUN
|
||||||
|
KOR
|
||||||
|
MET
|
||||||
|
FRE
|
||||||
|
XIS
|
||||||
|
SLI
|
||||||
|
PKP
|
||||||
|
HOG
|
||||||
|
RZH
|
||||||
|
GOOF
|
||||||
|
MRPR
|
||||||
|
JJR
|
||||||
|
FIRC
|
||||||
|
INC
|
||||||
|
PHL
|
||||||
|
BGB
|
||||||
|
ANTR
|
||||||
|
MIW
|
||||||
|
WJ
|
||||||
|
JRD
|
||||||
|
CHOC
|
||||||
|
ANCL
|
||||||
|
JLLO
|
||||||
|
JNLG
|
||||||
|
KOS
|
||||||
|
TKRG
|
||||||
|
XAL
|
||||||
|
STLP
|
||||||
|
CBOS
|
||||||
|
DUNC
|
||||||
|
FXMC
|
||||||
|
DRSD
|
||||||
|
COI
|
||||||
|
CYBR
|
||||||
Reference in New Issue
Block a user