Commit c0425105 authored by auraes's avatar auraes 💬
Browse files

Versions des grammaires séparées

parent efd50329
......@@ -47,41 +47,41 @@
];
Verb 'parler'
* 'à'/'au'/'aux'/'avec' creature -> TalkTo
* 'à'/'au'/'aux'/'avec' creature
* 'a'/'au'/'aux'/'avec' creature -> TalkTo
* 'a'/'au'/'aux'/'avec' creature
'de'/'d^'/'du'/'des' topic -> Tell
* 'de'/'d^'/'du'/'des' topic
'à'/'au'/'aux'/'avec' creature -> Tell reverse
'a'/'au'/'aux'/'avec' creature -> Tell reverse
;
#Ifnot;
Verb 'parler'
* 'à'/'au'/'aux'/'avec' creature
* 'a'/'au'/'aux'/'avec' creature
'de'/'d^'/'du'/'des' topic -> Tell
* 'de'/'d^'/'du'/'des' topic
'à'/'au'/'aux'/'avec' creature -> Tell reverse
'a'/'au'/'aux'/'avec' creature -> Tell reverse
;
#Endif;
Verb 'répondre'
* 'à'/'au'/'aux' creature topic -> Answer reverse
* topic 'à'/'au'/'aux' creature -> Answer
Verb 'repondre'
* 'a'/'au'/'aux' creature topic -> Answer reverse
* topic 'a'/'au'/'aux' creature -> Answer
;
Verb 'demander'
* noun 'à'/'au'/'aux' creature -> AskFor reverse
* 'à'/'au'/'aux' creature noun -> AskFor
* 'à'/'au'/'aux' creature 'de'/'d^' topic -> AskTo
* noun 'a'/'au'/'aux' creature -> AskFor reverse
* 'a'/'au'/'aux' creature noun -> AskFor
* 'a'/'au'/'aux' creature 'de'/'d^' topic -> AskTo
;
Verb 'dire'
* 'à'/'au'/'aux' creature 'de'/'d^' topic -> AskTo
* 'à'/'au'/'aux' creature topic -> Answer reverse
* topic 'à'/'au'/'aux' creature -> Answer
* 'a'/'au'/'aux' creature 'de'/'d^' topic -> AskTo
* 'a'/'au'/'aux' creature topic -> Answer reverse
* topic 'a'/'au'/'aux' creature -> Answer
;
Verb 'interroger'
* creature 'sur' topic -> Ask ! concernant
* creature 'à' 'propos' 'de'/'d^'/'du'/'des' topic-> Ask ! au_sujet_de
* creature 'a' 'propos' 'de'/'d^'/'du'/'des' topic-> Ask ! au_sujet_de
;
!Verb 'attaquer'
......@@ -90,12 +90,12 @@ Verb 'interroger'
!;
Verb 'montrer'
* held 'à'/'au'/'aux' creature -> Show
* 'à'/'au'/'aux' creature held -> Show reverse
* held 'a'/'au'/'aux' creature -> Show
* 'a'/'au'/'aux' creature held -> Show reverse
;
#IfDef OPTIONAL_EXTENDED_VERBSET;
Verb 'réveiller'
Verb 'reveiller'
* 'soi' -> Wake
* creature -> WakeOther
;
......@@ -114,10 +114,10 @@ Verb 'regarder' 'l//' 'r//'
* -> Look
* noun -> Examine
* 'sur'/'dans'/'par'/'par-dessus' noun -> Search ! derrière
! * 'à'/'au'/'en'/'vers' noun=ADirection -> Examine ! compass_look
* 'à'/'au' 'travers' noun -> Search
! * 'a'/'au'/'en'/'vers' noun=ADirection -> Examine ! compass_look
* 'a'/'au' 'travers' noun -> Search
! * 'sous' noun -> LookUnder
! * topic 'à'/'au'/'sur'/'dans' noun -> Consult
! * topic 'a'/'au'/'sur'/'dans' noun -> Consult
;
Verb 'examiner' 'x//'
......@@ -141,8 +141,8 @@ Verb 'fouiller'
!;
Verb 'aller'
* 'à'/'au'/'en'/'vers' noun=ADirection -> Go
* 'à'/'au'/'aux'/'sur'/'dans'/'sous' noun -> Enter
* 'a'/'au'/'en'/'vers' noun=ADirection -> Go
* 'a'/'au'/'aux'/'sur'/'dans'/'sous' noun -> Enter
;
Verb 'entrer'
......@@ -160,27 +160,27 @@ Verb 'sortir'
Verb 'passer'
* 'sur'/'dans'/'par'/'sous' noun -> Enter
* 'par-dessus' noun -> Enter
* 'à' 'travers' noun -> Enter
* 'a' 'travers' noun -> Enter
;
Verb 'monter'
* -> sGoUp
* 'à'/'au'/'aux'/'sur'/'dans'/'par'/'en' noun -> Enter
* 'a'/'au'/'aux'/'sur'/'dans'/'par'/'en' noun -> Enter
;
Verb 'descendre' 'd//'
* -> sGetOff
* 'de'/'d^'/'du'/'des' noun -> GetOff
* 'à'/'au'/'aux'/'sur'/'dans'/'par' noun -> Enter
* 'a'/'au'/'aux'/'sur'/'dans'/'par' noun -> Enter
;
Verb 'grimper'
* 'sur'/'à'/'au'/'aux'/'dans'/'par' noun -> Enter
* 'sur'/'a'/'au'/'aux'/'dans'/'par' noun -> Enter
;
Verb 'sauter'
* -> Jump
! * 'à' noun -> Jump ! la corde
! * 'a' noun -> Jump ! la corde
* 'sur'/'dans' noun -> Enter
* 'par-dessus' noun -> JumpOver
* 'par'/'de'/'du'/'des' noun -> Exit
......@@ -200,18 +200,18 @@ Verb 'nager' 'conduire'
;
Verb 'balancer' 'suspendre'
* 'soi' 'à'/'au'/'aux'/'sur'/'dans' noun -> Swing
* 'soi' 'a'/'au'/'aux'/'sur'/'dans' noun -> Swing
;
#Endif;
Verb 'prendre'
* multi -> Take
* multiinside 'à'/'au'/'aux' noun -> Remove
* multiinside 'a'/'au'/'aux' noun -> Remove
* multiinside 'de'/'d^'/'du'/'des'/'dans'/'sur'
noun -> Remove
;
Verb 'décoller' 'détacher'
Verb 'decoller' 'detacher'
* noun -> Take
;
......@@ -222,16 +222,16 @@ Verb 'acheter'
#Endif;
Verb 'donner'
* held 'à'/'au'/'aux' creature -> Give
* 'à'/'au'/'aux' creature held -> Give reverse
* held 'a'/'au'/'aux' creature -> Give
* 'a'/'au'/'aux' creature held -> Give reverse
;
Verb 'lancer' 'jeter'
* noun -> ThrowAt
* held 'à'/'au'/'aux' noun -> ThrowAt
* held 'a'/'au'/'aux' noun -> ThrowAt
* held 'sur'/'dans'/'contre'/
'par'/'par-dessus' noun -> ThrowAt
* 'à'/'au'/'aux' noun held -> ThrowAt reverse
* 'a'/'au'/'aux' noun held -> ThrowAt reverse
;
Verb 'poser'
......@@ -240,7 +240,7 @@ Verb 'poser'
* multiexcept 'sur' noun -> PutOn
;
Verb 'insérer' 'introduire'
Verb 'inserer'
* multiexcept 'dans'/'sous'/'entre' noun -> Insert
;
......@@ -275,7 +275,7 @@ Verb 'vider'
Verb 'pousser'
* noun -> Push
* noun 'à'/'au'/'en'/'vers' noun -> PushDir !contre?
* noun 'a'/'au'/'en'/'vers' noun -> PushDir !contre?
* noun 'sur'/'dans' noun -> Transfer
;
......@@ -298,14 +298,14 @@ Verb 'ouvrir'
Verb 'fermer'
* noun -> Close
* noun 'à'/'avec' held -> Lock
* noun 'a'/'avec' held -> Lock
;
Verb 'verrouiller'
* noun 'avec' held -> Lock
;
Verb 'déverrouiller'
Verb 'deverrouiller'
* noun 'avec' held -> Unlock
;
......@@ -314,7 +314,7 @@ Verb 'forcer' 'fracturer'
;
#IfDef OPTIONAL_EXTENDED_VERBSET;
Verb 'écraser' 'presser'
Verb 'ecraser' 'presser'
* noun -> Squeeze !appuyer_sur? (!=Push)
;
#Endif;
......@@ -323,23 +323,23 @@ Verb 'appuyer'
* 'sur' noun -> Push ! Squeeze !?
;
Verb 'allumer' 'démarrer'
Verb 'allumer' 'demarrer'
* noun -> SwitchOn
;
Verb 'éteindre' 'arrêter'
Verb 'eteindre' 'arreter'
* noun -> SwitchOff
;
Verb 'attacher'
* noun -> Tie
* noun 'à'/'au'/'aux'/'avec'/'sur'/'dans' noun -> Tie
* noun 'a'/'au'/'aux'/'avec'/'sur'/'dans' noun -> Tie
;
#IfDef OPTIONAL_EXTENDED_VERBSET;
Verb 'régler'
Verb 'regler'
* noun -> Set
* noun 'à'/'sur' special -> SetTo
* noun 'a'/'sur' special -> SetTo
;
Verb 'agiter' 'secouer'
......@@ -358,18 +358,18 @@ Verb 'creuser'
* 'sur'/'dans' noun 'avec' held -> Dig
;
Verb 'couper' 'déchirer'
Verb 'couper' 'dechirer'
* noun -> Cut
* noun 'avec' held -> Attack
;
Verb 'attaquer' 'casser' 'détruire' 'briser'
Verb 'attaquer' 'casser' 'detruire' 'briser'
* noun -> Attack !attaquer creature?
* noun 'avec ' held -> Attack
;
#IfDef OPTIONAL_EXTENDED_VERBSET;
Verb 'brûler'
Verb 'bruler'
* noun -> Burn
* noun 'avec' held -> Burn
;
......@@ -384,7 +384,7 @@ Verb 'nettoyer'
* noun -> Rub
;
!Verb 'utiliser' 'actionner' 'faire' 'déplacer'
!Verb 'utiliser' 'actionner' 'faire' 'deplacer'
! * topic -> VagueVerb
!;
......@@ -392,7 +392,7 @@ Verb 'toucher' 'caresser'
* noun -> Touch
;
Verb 'écouter'
Verb 'ecouter'
* -> Listen
* noun -> Listen
;
......@@ -403,7 +403,7 @@ Verb 'sentir'
;
#IfDef OPTIONAL_EXTENDED_VERBSET;
Verb 'goûter'
Verb 'gouter'
* noun -> Taste
;
......@@ -411,7 +411,7 @@ Verb 'chanter'
* -> Sing
;
Verb 'penser' 'réfléchir'
Verb 'penser' 'reflechir'
* -> Think
;
......@@ -938,13 +938,13 @@ Verb 'inventaire' 'i//'
[ UnlockSub;
if (ObjectIsUntouchable(noun)) return;
if (noun hasnt lockable) { PrintMsg(MSG_UNLOCK_NOT_A_LOCK, 'déverrouiller'); rtrue; }
if (noun hasnt locked) { PrintMsg(MSG_UNLOCK_ALREADY_UNLOCKED, 'déverrouiller'); rtrue; }
if (noun hasnt lockable) { PrintMsg(MSG_UNLOCK_NOT_A_LOCK, 'deverrouiller'); rtrue; }
if (noun hasnt locked) { PrintMsg(MSG_UNLOCK_ALREADY_UNLOCKED, 'deverrouiller'); rtrue; }
if (RunRoutines(noun, with_key) ~= second) { PrintMsg(MSG_UNLOCK_KEY_DOESNT_FIT); rtrue; }
give noun ~locked;
if (AfterRoutines()) rtrue;
if (keep_silent) rtrue;
PrintMsg(MSG_UNLOCK_SUCCESS, 'déverrouiller');
PrintMsg(MSG_UNLOCK_SUCCESS, 'deverrouiller');
];
[ WaitSub;
......@@ -1124,19 +1124,19 @@ Verb meta 'description'
* -> LookModeNormal
* 'longue' -> LookModeLong
* 'courte' -> LookModeShort
* 'brève'/'normale' -> LookModeNormal;
* 'breve'/'normale' -> LookModeNormal;
#IfDef OPTIONAL_FULL_SCORE;
Verb meta 'score'
* -> Score
* 'total' -> FullScore
* 'activer'/'on' -> NotifyOn
* 'désactiver'/'off' -> NotifyOff;
* 'desactiver'/'off' -> NotifyOff;
#Ifnot;
Verb meta 'score'
* -> Score
* 'activer'/'on' -> NotifyOn
* 'désactiver'/'off' -> NotifyOff;
* 'desactiver'/'off' -> NotifyOff;
#EndIf;
Verb meta 'oups'
......@@ -1321,15 +1321,15 @@ Verb meta 'lieux'
Verb 'commandes'
* -> CommandsOn
* 'activer'/'on' -> CommandsOn
* 'désactiver'/'off' -> CommandsOff
* 'desactiver'/'off' -> CommandsOff
* 'rejouer' -> CommandsRead;
Verb meta 'script' 'transcription'
* -> ScriptOn
* 'activer'/'on' -> ScriptOn
* 'désactiver'/'off' -> ScriptOff;
* 'desactiver'/'off' -> ScriptOff;
Verb meta 'vérifier'
Verb meta 'verifier'
* -> Verify;
[ CommandsOnSub;
......@@ -1902,18 +1902,17 @@ Global scope_cnt;
if(PrintVerb(p_v)) return;
#IfV3;
switch(p_v) {
'déverrouiller': print "déverrouiller"; return;
'deverrouiller': print "déverrouiller"; return;
'enlever': print "enlever"; return;
'insérer': print "insérer"; return;
'introduire': print "introduire"; return;
'insérer': print "insérer"; return;
'inserer': print "insérer"; return;
'inserer': print "insérer"; return;
'prendre': print "prendre"; return;
'retirer': print "retirer"; return;
'verrouiller': print "verrouiller"; return;
}
#IfNot;
switch(p_v) {
'déverrouiller': print "déverrouiller"; return;
'deverrouiller': print "déverrouiller"; return;
'verrouiller': print "verrouiller"; return;
}
#EndIf;
......
This diff is collapsed.
......@@ -67,9 +67,9 @@ Include "scope.h";
Include "grammar_v3.h";
#IfNot;
#IfDef AVEC_ACCENTS;
Include "grammar.h";
Include "grammar_accents.h";
#IfNot;
Include "grammar_v3.h";
Include "grammar.h";
#EndIf;
#EndIf;
......
......@@ -102,7 +102,7 @@ System_file;
'au', 'aux':
parse-->(i*2-1) = 'a//';
parse->(i*4) = 1;
'du', 'd^':
'du', 'd^': !FIXME d^
parse-->(i*2-1) = 'de';
#IfDef DE_A_JOUER;
......@@ -160,10 +160,12 @@ System_file;
if (r) {
if (r == 1) {
parse-->1 = parse-->3;
!parse-->2 = parse-->4;
parse-->3 = w;
}
else {
parse-->1 = parse-->5;
!parse-->2 = parse-->6;
parse-->3 = w1;
parse-->5 = w;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment