Skip to content

Commit bc8fc24

Browse files
committed
rename spells charmiglio / Charmiglio to flarigo / charmiglio
to avoid confusion (player using charmiglio instead of Charmiglio in the second mission)
1 parent bc223ea commit bc8fc24

File tree

19 files changed

+33
-33
lines changed

19 files changed

+33
-33
lines changed

missions/intermediate/05_background/auto.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
# set -m
44

5-
charmiglio & charmiglio & charmiglio & gsh check
5+
flarigo & flarigo & flarigo & gsh check

missions/intermediate/05_background/check.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env sh
22

3-
command="$(gettext 'charmiglio')"
3+
command="$(gettext 'flarigo')"
44

5-
PIDS=$GSH_TMP/charmiglio.pids
5+
PIDS=$GSH_TMP/flarigo.pids
66

77
_check() {
88
rm -f "$PIDS"

missions/intermediate/05_background/charmiglio.sh renamed to missions/intermediate/05_background/flarigo.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
. gsh_gettext.sh
44

5-
command=$(gettext "charmiglio")
5+
command=$(gettext "flarigo")
66

77

88
file="$MISSION_DIR/ascii-art/f$((1 + $(RANDOM)%6))"
99
indent=$(echo " " | head -c "$((2 + 4 * ($(RANDOM)%8)))")
1010

11-
rm -f "$GSH_TMP/charmiglio.pids"
11+
rm -f "$GSH_TMP/flarigo.pids"
1212
for i in $(seq $((5 + $(RANDOM)%5)))
1313
do
1414
echo "$indent *"
@@ -17,7 +17,7 @@ done
1717

1818
awk -v indent="$indent" '{print indent, $0}' < "$file"
1919

20-
echo $$ >> "$GSH_TMP/charmiglio.pids"
20+
echo $$ >> "$GSH_TMP/flarigo.pids"
2121

2222
sleep 1
2323

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env sh
22

3-
command="$(gettext 'charmiglio')"
3+
command="$(gettext 'flarigo')"
44
sed "s/\\\$command/$command/g" "$(eval_gettext '$MISSION_DIR/goal/en.txt')"
55
unset command

missions/intermediate/05_background/i18n/en.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ msgstr "Mmm... I only saw $NB fireworks. That's not enough."
3333
msgid "NOTE: you need to make sure the pyrotechnician sees all the fireworks while he is waiting."
3434
msgstr "NOTE: you need to make sure the pyrotechnician sees all the fireworks while he is waiting."
3535

36-
msgid "charmiglio"
37-
msgstr "charmiglio"
36+
msgid "flarigo"
37+
msgstr "flarigo"

missions/intermediate/05_background/i18n/fr.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ msgstr "Mmm... Je n'ai vu que $NB feux d'artifices. Ce n'est pas assez."
3232
msgid "NOTE: you need to make sure the pyrotechnician sees all the fireworks while he is waiting."
3333
msgstr "NOTE : vous devez vous débrouiller pour que l'artificier voie tous les feux d'artifice pendant qu'il attend."
3434

35-
msgid "charmiglio"
36-
msgstr "charmiglio"
35+
msgid "flarigo"
36+
msgstr "flarigo"

missions/intermediate/05_background/i18n/it.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ msgstr "Mmm... io vedo solo $NB fuochi d'artificio. Non sono sufficenti."
4242
msgid "NOTE: you need to make sure the pyrotechnician sees all the fireworks while he is waiting."
4343
msgstr "NOTA: hai bisogno di verificare che il pirotecnico possa vedere tutti i fuochi di artificio mentre aspetta."
4444

45-
msgid "charmiglio"
46-
msgstr "charmiglio"
45+
msgid "flarigo"
46+
msgstr "flarigo"

missions/intermediate/05_background/i18n/template.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ msgstr ""
3232
msgid "NOTE: you need to make sure the pyrotechnician sees all the fireworks while he is waiting."
3333
msgstr ""
3434

35-
msgid "charmiglio"
35+
msgid "flarigo"
3636
msgstr ""
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env sh
22

33
_mission_init() {
4-
copy_bin "$MISSION_DIR/charmiglio.sh" "$GSH_BIN/$(gettext charmiglio)"
4+
copy_bin "$MISSION_DIR/flarigo.sh" "$GSH_BIN/$(gettext flarigo)"
55
}
66
_mission_init

missions/intermediate/05_background/test.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
# set -m
44

55
gsh assert check false
6-
charmiglio & gsh assert check false
7-
charmiglio & charmiglio & gsh assert check false
8-
charmiglio & charmiglio & charmiglio & gsh assert check true
9-
charmiglio & charmiglio & charmiglio & charmiglio & gsh assert check true
6+
flarigo & gsh assert check false
7+
flarigo & flarigo & gsh assert check false
8+
flarigo & flarigo & flarigo & gsh assert check true
9+
flarigo & flarigo & flarigo & flarigo & gsh assert check true
1010

11-
charmiglio & charmiglio & charmiglio
11+
flarigo & flarigo & flarigo
1212
gsh assert check false
1313

14-
charmiglio; charmiglio; charmiglio
14+
flarigo; flarigo; flarigo
1515
gsh assert check false
1616

1717

0 commit comments

Comments
 (0)