Update BusinessType and Direction by gender/plural and capitalized

Ludeon · Apr 19, 2020 · 436556f · 436556f
1 parent a598ea4
commit 436556f
Show file tree

Hide file tree

Showing 15 changed files with 147 additions and 54 deletions.
diff --git a/Core/DefInjected/RulePackDef/RulePacks_Global.xml b/Core/DefInjected/RulePackDef/RulePacks_Global.xml
@@ -42,7 +42,19 @@
   -->
   <GlobalUtility.rulePack.rulesFiles>
     <li>RomanNumeral->Words/Misc/Numbers_SmallRoman</li>
+    <li>BusinessType->Words/Nouns/BusinessTypes</li>
+    <li>BusinessType_Cap->Words/Nouns/BusinessTypes_Cap</li>
+    <li>BusinessType_Feminine->Words/Nouns/BusinessTypes_Feminine</li>
+    <li>BusinessType_Feminine_Cap->Words/Nouns/BusinessTypes_Feminine_Cap</li>
+    <li>BusinessType_Plural->Words/Nouns/BusinessTypes_Plural</li>
+    <li>BusinessType_Plural_Cap->Words/Nouns/BusinessTypes_Plural_Cap</li>
+    <li>BusinessType_FemPlural->Words/Nouns/BusinessTypes_FemPlural</li>
+    <li>BusinessType_FemPlural_Cap->Words/Nouns/BusinessTypes_FemPlural_Cap</li>
     <li>Direction->Words/Adjectives/CompassDirections</li>
+    <li>Direction_Masc->Words/Adjectives/CompassDirections_Masculine</li>
+    <li>Direction_MascPlur->Words/Adjectives/CompassDirections_MascPlural</li>
+    <li>Direction_Fem->Words/Adjectives/CompassDirections_Feminine</li>
+    <li>Direction_FemPlur->Words/Adjectives/CompassDirections_FemPlural</li>
     <li>Letter->WordParts/CapitalLetters</li>
     <li>SylB->WordParts/Syllables_Byzantinian</li>
     <li>SylE->WordParts/Syllables_English</li>
@@ -205,6 +217,13 @@
     <li>Trans->par</li>
     <li>Trans->avec</li>
     <li>Bodypart_fr->[Bodypart]</li>
+    <li>BusinessTypeAny_def->le [BusinessType]</li>
+    <li>BusinessTypeAny_def->la [BusinessType_Feminine]</li>
+    <li>BusinessTypeAny_def->les [BusinessType_Plural]</li>
+    <li>BusinessTypeAny_def_Cap->le [BusinessType_Cap]</li>
+    <li>BusinessTypeAny_def_Cap->la [BusinessType_Feminine_Cap]</li>
+    <li>BusinessTypeAny_def_Cap->les [BusinessType_Plural_Cap]</li>
+    <li>BusinessTypeAny_def_Cap->les [BusinessType_FemPlural_Cap]</li>
     <li>Character(p=6)->[PersonJob]</li>
     <li>Character(p=4)->[Animal]</li>
     <li>Character(p=3)->[Enemy]</li>
@@ -221,6 +240,14 @@
     <li>Character_FemPlural(p=3)->[Enemy_FemPlural]</li>
     <li>Character_AnyPlural->[Character_Plural]</li>
     <li>Character_AnyPlural->[Character_FemPlural]</li>
+    <li>Direction_Masculine->[Direction]</li>
+    <li>Direction_Masculine->[Direction_Masc]</li>
+    <li>Direction_MascPlural->[Direction]</li>
+    <li>Direction_MascPlural->[Direction_MascPlur]</li>
+    <li>Direction_Feminine->[Direction]</li>
+    <li>Direction_Feminine->[Direction_Fem]</li>
+    <li>Direction_FemPlural->[Direction]</li>
+    <li>Direction_FemPlural->[Direction_FemPlur]</li>
     <li>Quantity_adjphrase->deux</li>
     <li>Quantity_adjphrase->trois</li>
     <li>Quantity_adjphrase->quatre</li>

diff --git a/Core/DefInjected/RulePackDef/RulePacks_Namers_Traders.xml b/Core/DefInjected/RulePackDef/RulePacks_Namers_Traders.xml
@@ -20,22 +20,37 @@
     <li>maybe_adjective->[AdjectiveBadass]</li>
   -->
   <NamerTraderGeneral.rulePack.rulesStrings>
-    <li>r_name(p=4)->[businesstype] [businessname]</li>
-    <li>r_name->[businesstype] de [NamePerson]</li>
-    <li>r_name->[businesstype] de [Animal] [maybe_adjective]</li>
-    <li>r_name->[businesstype] [Letter][Letter]</li>
-    <li>r_name(p=0.5)->[businesstype] de [PersonAlly]</li>
-    <li>r_name(p=0.5)->[businesstype] [AdjectiveFriendly]</li>
-    <li>r_name(p=0.5)->[businesstype] [AdjectiveBadass]</li>
+    <li>r_name(p=4)->[BusinessTypeAny_def] [businessname]</li>
+    <li>r_name->[BusinessTypeAny_def] de [NamePerson]</li>
+    <li>r_name->[BusinessTypeAny_def] de [NamePerson] et frères</li>
+    <li>r_name->[BusinessTypeAny_def] de [NamePerson] et sœurs</li>
+    <li>r_name->[BusinessTypeAny_def] de [NamePerson] et cousins</li>
+    <li>r_name->[BusinessTypeAny_def] de le [PersonFamily] [NamePerson]</li>
+    <li>r_name->[BusinessTypeAny_def] de la [PersonFamily_Feminine] [NamePerson]</li>
+    <li>r_name->[BusinessTypeAny_def] de le [Animal] [maybe_adjective]</li>
+    <li>r_name->[BusinessTypeAny_def] de la [Animal_Feminine] [maybe_adjective_fem]</li>
+    <li>r_name->[BusinessTypeAny_def] [Letter][Letter]</li>
+    <li>r_name(p=0.5)->[BusinessTypeAny_def] de le [PersonAlly]</li>
+    <li>r_name(p=0.5)->le [BusinessType_Cap] [AdjectiveFriendly]</li>
+    <li>r_name(p=0.5)->la [BusinessType_Feminine_Cap] [AdjectiveFriendly_Feminine]</li>
+    <li>r_name(p=0.5)->les [BusinessType_Plural_Cap] [AdjectiveFriendly_Plural]</li>
+    <li>r_name(p=0.5)->les [BusinessType_FemPlural_Cap] [AdjectiveFriendly_FemPlural]</li>
+    <li>r_name(p=0.5)->le [BusinessType_Cap] [AdjectiveBadass]</li>
+    <li>r_name(p=0.5)->la [BusinessType_Feminine_Cap] [AdjectiveBadass_Feminine]</li>
+    <li>r_name(p=0.5)->les [BusinessType_Plural_Cap] [AdjectiveBadass_Plural]</li>
+    <li>r_name(p=0.5)->les [BusinessType_FemPlural_Cap] [AdjectiveBadass_FemPlural]</li>
     <li>r_name(p=0.3)->[businesstype] [PersonFamily]</li>
-    <li>r_name(p=0.3)->[businesstype] [NaturalObject] [maybe_adjective]</li>
-    <li>r_name(p=0.3)->[businesstype] [NaturalObject_Feminine] [maybe_adjective_fem]</li>
-    <li>r_name(p=0.2)->[businesstype] [TreeType] [maybe_adjective]</li>
-    <li>r_name(p=0.2)->[businesstype] [TreeType_Feminine] [maybe_adjective_fem]</li>
-    <li>r_name(p=0.2)->[businesstype] [Vegetable] [maybe_adjective]</li>
-    <li>r_name(p=0.2)->[businesstype] [Vegetable_Feminine] [maybe_adjective_fem]</li>
-    <!--     <li>r_name(p=0.2)->[Direction] [businesstype]</li>-->
-    <li>r_name(p=0.2)->[businesstype] [celestial_name] [Direction]</li>
+    <li>r_name(p=0.3)->[BusinessTypeAny_def] [NaturalObject] [maybe_adjective]</li>
+    <li>r_name(p=0.3)->[BusinessTypeAny_def] [NaturalObject_Feminine] [maybe_adjective_fem]</li>
+    <li>r_name(p=0.2)->[BusinessTypeAny_def] [TreeType] [maybe_adjective]</li>
+    <li>r_name(p=0.2)->[BusinessTypeAny_def] [TreeType_Feminine] [maybe_adjective_fem]</li>
+    <li>r_name(p=0.2)->[BusinessTypeAny_def] [Vegetable] [maybe_adjective]</li>
+    <li>r_name(p=0.2)->[BusinessTypeAny_def] [Vegetable_Feminine] [maybe_adjective_fem]</li>
+    <li>r_name(p=0.2)->le [BusinessType_Cap] [Direction_Masculine]</li>
+    <li>r_name(p=0.2)->la [BusinessType_Feminine_Cap] [Direction_Feminine]</li>
+    <li>r_name(p=0.2)->les [BusinessType_Plural_Cap] [Direction_MascPlural]</li>
+    <li>r_name(p=0.2)->les [BusinessType_FemPlural_Cap] [Direction_FemPlural]</li>
+    <li>r_name(p=0.2)->[BusinessTypeAny_def] [celestial_name] [Direction]</li>
     <li>maybe_adjective-></li>
     <li>maybe_adjective->[Color]</li>
     <li>maybe_adjective->[AdjectiveFriendly]</li>

diff --git a/Core/Strings/Words/Adjectives/CompassDirections.txt b/Core/Strings/Words/Adjectives/CompassDirections.txt
@@ -15,12 +15,3 @@ du sud
 du sud-ouest
 de l'ouest
 du nord-ouest
-
-dans le nord
-dans le nord-est
-dans l'est
-dans le sud-est
-dans le sud
-dans le sud-ouest
-dans l'ouest
-dans le nord-ouest
diff --git a/Core/Strings/Words/Adjectives/CompassDirections_FemPlural.txt b/Core/Strings/Words/Adjectives/CompassDirections_FemPlural.txt
@@ -0,0 +1,8 @@
+nordiques
+nord-orientales
+orientales
+est-méridionales
+australes
+ouest-méridionales
+occidentales
+nord-occidentales
diff --git a/Core/Strings/Words/Adjectives/CompassDirections_Feminine.txt b/Core/Strings/Words/Adjectives/CompassDirections_Feminine.txt
@@ -0,0 +1,8 @@
+nordique
+nord-orientale
+orientale
+est-méridionale
+australe
+ouest-méridionale
+occidentale
+nord-occidentale
diff --git a/Core/Strings/Words/Adjectives/CompassDirections_MascPlural.txt b/Core/Strings/Words/Adjectives/CompassDirections_MascPlural.txt
@@ -0,0 +1,8 @@
+nordiques
+nord-orientaux
+orientaux
+est-méridionaux
+australs
+ouest-méridionaux
+occidentaux
+nord-occidentaux
diff --git a/Core/Strings/Words/Adjectives/CompassDirections_Masculine.txt b/Core/Strings/Words/Adjectives/CompassDirections_Masculine.txt
@@ -0,0 +1,8 @@
+nordique
+nord-oriental
+oriental
+est-méridional
+austral
+ouest-méridional
+occidental
+nord-occidental
diff --git a/Core/Strings/Words/Nouns/BusinessTypes.txt b/Core/Strings/Words/Nouns/BusinessTypes.txt
@@ -1,30 +1,12 @@
-Société
-Partenaires
-Corporation
-Commerçants
-Industries
-Voyageurs
-Cartel
-Livreur
-Exportateur
-Importateur
-Transporteur
-Assurances
-Consortium
-Comptoir
-Holding
-Compagnie
-Ligue
-Industrie
-Les établissements
-Coopérative
-Club
-Comité
-Confrérie
-Congrégation
-Fédération
-Coalition
-Commandite
-Institut
-Syndicat
-Association
+cartel
+livreur
+exportateur
+importateur
+transporteur
+consortium
+comptoir
+holding
+club
+comité
+institut
+syndicat
diff --git a/Core/Strings/Words/Nouns/BusinessTypes_Cap.txt b/Core/Strings/Words/Nouns/BusinessTypes_Cap.txt
@@ -0,0 +1,12 @@
+Cartel
+Livreur
+Exportateur
+Importateur
+Transporteur
+Consortium
+Comptoir
+Holding
+Club
+Comité
+Institut
+Syndicat
diff --git a/Core/Strings/Words/Nouns/BusinessTypes_FemPlural.txt b/Core/Strings/Words/Nouns/BusinessTypes_FemPlural.txt
@@ -0,0 +1,2 @@
+industries
+assurances
diff --git a/Core/Strings/Words/Nouns/BusinessTypes_FemPlural_Cap.txt b/Core/Strings/Words/Nouns/BusinessTypes_FemPlural_Cap.txt
@@ -0,0 +1,2 @@
+Industries
+Assurances
diff --git a/Core/Strings/Words/Nouns/BusinessTypes_Feminine.txt b/Core/Strings/Words/Nouns/BusinessTypes_Feminine.txt
@@ -0,0 +1,11 @@
+société
+corporation
+holding
+industrie
+coopérative
+confrérie
+congrégation
+fédération
+coalition
+commandite
+association
diff --git a/Core/Strings/Words/Nouns/BusinessTypes_Feminine_Cap.txt b/Core/Strings/Words/Nouns/BusinessTypes_Feminine_Cap.txt
@@ -0,0 +1,11 @@
+Société
+Corporation
+Holding
+Industrie
+Coopérative
+Confrérie
+Congrégation
+Fédération
+Coalition
+Commandite
+Association
diff --git a/Core/Strings/Words/Nouns/BusinessTypes_Plural.txt b/Core/Strings/Words/Nouns/BusinessTypes_Plural.txt
@@ -0,0 +1,4 @@
+partenaires
+commerçants
+voyageurs
+établissements
diff --git a/Core/Strings/Words/Nouns/BusinessTypes_Plural_Cap.txt b/Core/Strings/Words/Nouns/BusinessTypes_Plural_Cap.txt
@@ -0,0 +1,4 @@
+Partenaires
+Commerçants
+Voyageurs
+Établissements