diff options
| author | Fedja Beader <fedja@protonmail.ch> | 2023-08-21 20:56:49 +0000 |
|---|---|---|
| committer | Fedja Beader <fedja@protonmail.ch> | 2023-08-21 20:56:49 +0000 |
| commit | d99010422f9ab7244b1966d82eaada5b2b62c721 (patch) | |
| tree | bdf44ace8d7b691940bbb25b0c87ff69a0b655dd | |
| parent | 9da6407f713ecdd748d2d358f1167a7f3d4a863d (diff) | |
| parent | 3f44e958eb1238f249f3f009eb24dec8c128db52 (diff) | |
| download | serverdata-d99010422f9ab7244b1966d82eaada5b2b62c721.tar.gz serverdata-d99010422f9ab7244b1966d82eaada5b2b62c721.tar.bz2 serverdata-d99010422f9ab7244b1966d82eaada5b2b62c721.tar.xz serverdata-d99010422f9ab7244b1966d82eaada5b2b62c721.zip | |
Merge branch 'bravure->bravery' into 'master'
Bravure is portuguese for bravery.
See merge request ml/serverdata!118
| -rw-r--r-- | npc/003-1/lieutenantdausen.txt | 2 | ||||
| -rw-r--r-- | npc/006-10/logic.txt | 2 | ||||
| -rw-r--r-- | npc/025-1/ctrl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt index 6d0bbcd8c..1168483f9 100644 --- a/npc/003-1/lieutenantdausen.txt +++ b/npc/003-1/lieutenantdausen.txt @@ -247,7 +247,7 @@ function DausenMobTutorial { } // Quest Body mesn; - mesq l("You've passed the test of courage. Bravure you have, but are you a real adventurer?"); + mesq l("You've passed the test of courage. Bravery you have, but are you a real adventurer?"); next; mesn; mesq l("You have good intentions, be brave, but in a world where power is measured in levels, numbers have more meaning than they should."); diff --git a/npc/006-10/logic.txt b/npc/006-10/logic.txt index 931a387a7..2a92c954f 100644 --- a/npc/006-10/logic.txt +++ b/npc/006-10/logic.txt @@ -128,7 +128,7 @@ OnTouch: // -------------------------------------------------- 006-10,43,28,0 script Crypt#Fefe NPC_NO_SPRITE,{ mesn l("Crypt"); - mesc l("Herein lies Fefe, for his great bravure and heroic deeds, savior of our realm, valiantly defeated in combat against the Monster King, may the mana shine upon him forever."); + mesc l("Herein lies Fefe, for his great bravery and heroic deeds, savior of our realm, valiantly defeated in combat against the Monster King, may the mana shine upon him forever."); next; mesn l("Crypt"); mesc l("Herein also lies Raid Yahoo, enemy of manakind and nemesis of Saul, the one hated by many and loved by few, greedy mana stone collector, but who still opposed to the Monster King and lost her life for it."); diff --git a/npc/025-1/ctrl.c b/npc/025-1/ctrl.c index ea31873d6..563182fca 100644 --- a/npc/025-1/ctrl.c +++ b/npc/025-1/ctrl.c @@ -449,7 +449,7 @@ OnConquest: freeloop(true); for (.@i=0; .@i < getarraysize($@FORT_BLACKLIST); .@i++) { .@cid=$@FORT_BLACKLIST[.@i]; - rodex_sendmail(.@cid, "Commander Povo", "Fortress Town Reward", "For your bravure in Fortress Town conquest! Cheers!", 0, StrangeCoin, 1+$MK_TEMPVAR); + rodex_sendmail(.@cid, "Commander Povo", "Fortress Town Reward", "For your bravery in Fortress Town conquest! Cheers!", 0, StrangeCoin, 1+$MK_TEMPVAR); } freeloop(false); // Clean up the remainders of the fight |