Skip to content

Commit 729703e

Browse files
authored
Merge pull request #5 from baba33mrt/main
Change duplicated variables
2 parents 8424da8 + 6a1d3ed commit 729703e

1 file changed

Lines changed: 20 additions & 20 deletions

File tree

patterns/NationsGloryJava.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ player_alias:
1010

1111
player_warp:
1212
pattern: "{timestamp} [INFO] [NationsGUI] {player} vient de payer 20 pour se téléporter au warp {region}"
13-
13+
1414
player_back:
1515
pattern: "{timestamp} [INFO] [NationsUtils] Back du joueur {player} vers {world}, {x}, {y}, {z}"
1616

@@ -67,7 +67,7 @@ war_start:
6767
pattern: "{timestamp} [INFO] [NationsGUI] START WAR between {country_a} and {country_b} for reason {reason}"
6868

6969
war_surrend:
70-
pattern: "{timestamp} [INFO] [NationsGUI] {country} SURREND WAR AGAINST {country} APPLY REWARDS : {reward}#{amount}"
70+
pattern: "{timestamp} [INFO] [NationsGUI] {country} SURREND WAR AGAINST {target_country} APPLY REWARDS : {reward}#{amount}"
7171

7272
war_status_change:
7373
pattern: "{timestamp} [INFO] [NationsUtils] Change status of war request between {country_a} and {country_b} by {player} to {status}"
@@ -95,29 +95,29 @@ war_end_decrease_powerloss:
9595
# ===========================
9696

9797
chunk_access:
98-
pattern: "{timestamp} [INFO] [Factions] Player {player} set access to player {player} in chunk {x}, {z} to true"
99-
98+
pattern: "{timestamp} [INFO] [Factions] Player {player} set access to player {target_player} in chunk {x}, {z} to true"
99+
100100
chunk_unaccess:
101-
pattern: "{timestamp} [INFO] [Factions] Player {player} remove access to player {player} in chunk {x}, {z} to false"
102-
101+
pattern: "{timestamp} [INFO] [Factions] Player {player} remove access to player {target_player} in chunk {x}, {z} to false"
102+
103103
faction_chat:
104104
pattern: "{timestamp} [INFO] [FactionChat] FACTION|{player}: {text}"
105-
105+
106106
faction_invite:
107-
pattern: "{timestamp} [INFO] [NationsGUI] Player {player} invited {player} to join country {country}"
108-
107+
pattern: "{timestamp} [INFO] [NationsGUI] Player {player} invited {invited_player} to join country {country}"
108+
109109
faction_uninvite:
110-
pattern: "{timestamp} [INFO] [NationsGUI] Player {player} cancelled invitation {player} to join country {country}"
111-
110+
pattern: "{timestamp} [INFO] [NationsGUI] Player {player} cancelled invitation {invited_player} to join country {country}"
111+
112112
faction_promote:
113-
pattern: "{timestamp} [INFO] [NationsGUI] Player {player} demoted to {rank} {player} in country {country}"
114-
113+
pattern: "{timestamp} [INFO] [NationsGUI] Player {player} demoted to {rank} {target_player} in country {country}"
114+
115115
faction_demote:
116-
pattern: "{timestamp} [INFO] [NationsGUI] Player {player} prommoted to {rank} {player} in country {country}"
117-
116+
pattern: "{timestamp} [INFO] [NationsGUI] Player {player} prommoted to {rank} {target_player} in country {country}"
117+
118118
faction_perms:
119119
pattern: "{timestamp} [INFO] [FACTION] {player} changed faction permission {permission} to [{ALLY}, {LEADER}, {MEMBER}, {NEUTRAL}, {OFFICER}, {RECRUIT}]"
120-
120+
121121
# ===========================
122122
# Bank transactions
123123
# ===========================
@@ -282,7 +282,7 @@ warzone_add_power:
282282

283283
warzone_add_powerboost:
284284
pattern: "{timestamp} [INFO] [WarZone] Le pays {country} vient de recevoir un powerboost de {amount} de la warzone."
285-
285+
286286
# ===========================
287287
# Economie / Pays
288288
# ===========================
@@ -294,7 +294,7 @@ country_action_buy:
294294
pattern: "{timetamp} [INFO] [NationsGUI] ACHAT ACTION : {country_a}({player}) buy action of {country_b} for {price}$"
295295

296296
country_found:
297-
pattern: "{timestamp} [INFO] ONU >> {country} vient de fonder le pays {country} !"
297+
pattern: "{timestamp} [INFO] ONU >> {player} vient de fonder le pays {country} !"
298298

299299
country_new_leader:
300300
pattern: "{timestamp} [INFO] ONU >> {player} est le nouveau dirigeant du pays {country} !"
@@ -325,10 +325,10 @@ meteor_spawn:
325325
# ===========================
326326

327327
access_set:
328-
pattern: "{timestamp} [INFO] [Factions] Player {player} set access to player {player} in chunk {x}, {z} to true"
328+
pattern: "{timestamp} [INFO] [Factions] Player {player} set access to player {target_player} in chunk {x}, {z} to true"
329329

330330
access_remove:
331-
pattern: "{timestamp} [INFO] [Factions] Player {player} remove access to player {player} in chunk {x}, {z} to false"
331+
pattern: "{timestamp} [INFO] [Factions] Player {player} remove access to player {target_player} in chunk {x}, {z} to false"
332332

333333
# ===========================
334334
# Divers

0 commit comments

Comments
 (0)