diff options
author | Jesusaves <cpntb1@ymail.com> | 2024-07-30 12:12:35 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2024-07-30 12:12:35 -0300 |
commit | f767d173c36e1a14625f24758a02f29f564eca3c (patch) | |
tree | 3744e52a71cf01ae0e0da8e172b24e281456fd11 | |
parent | d4830e3a43eb7bc9faf92400ba9f2765a7bd8b0e (diff) | |
download | serverdata-f767d173c36e1a14625f24758a02f29f564eca3c.tar.gz serverdata-f767d173c36e1a14625f24758a02f29f564eca3c.tar.bz2 serverdata-f767d173c36e1a14625f24758a02f29f564eca3c.tar.xz serverdata-f767d173c36e1a14625f24758a02f29f564eca3c.zip |
No more soren meme
Rename Soren Mercenary Card to Meway (same letter counter)
Rename Worker's Day Soren to Livio (not a formal contributor)
-rw-r--r-- | db/mercenary_db.txt | 2 | ||||
-rw-r--r-- | db/re/item_db.conf | 4 | ||||
-rw-r--r-- | npc/001-5/worker.txt | 2 | ||||
-rw-r--r-- | npc/functions/array.txt | 2 | ||||
-rw-r--r-- | npc/functions/event.txt | 2 | ||||
-rw-r--r-- | npc/items/mercenary.txt | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt index e87fab010..1ca91ae93 100644 --- a/db/mercenary_db.txt +++ b/db/mercenary_db.txt @@ -19,7 +19,7 @@ 1201,Merc_Jesusalva,Jesusalva ,37,3618,452,1,254,277,232,77,24,31,17,1,32,15,10,12,1,11,45,152,776,480,200 1202,Merc_GonzoDark,GonzoDark ,23,2740,316,1,163,181,127,45,24,10,15,1,22,1,10,12,1,11,45,152,860,480,200 1203,Merc_Apane,Legendary Apane ,8,1787,176,1,66,73,33,16,3,1,4,1,24,1,10,12,1,11,45,152,896,480,200 -1204,Merc_Soren,Soren ,4,1561,141,2,25,25,14,7,1,1,1,1,1,1,10,12,1,11,45,152,896,480,200 +1204,Merc_Meway,Meway ,4,1561,141,2,25,25,14,7,1,1,1,1,1,1,10,12,1,11,45,152,896,480,200 1205,Merc_DragonStar,Dragon Star ,75,5305,796,1,421,440,563,187,77,86,1,1,15,32,10,12,1,11,45,150,556,480,140 1206,Merc_Rosa,Rosa ,25,2542,332,4,181,200,142,47,17,18,9,1,22,11,10,12,1,11,45,150,980,480,200 1207,Merc_Earthwitch,Earth Witch ,40,3229,488,5,284,308,256,85,22,35,15,6,30,19,10,12,1,11,45,150,960,480,200 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index cb05ee627..bb5dc0970 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -19113,8 +19113,8 @@ item_db: ( }, { Id: 7591 - AegisName: "MercCard_Soren" - Name: "Soren Card" + AegisName: "MercCard_Meway" + Name: "Meway Card" Type: "IT_USABLE" Buy: 30000 Sell: 1500 diff --git a/npc/001-5/worker.txt b/npc/001-5/worker.txt index 8d21b0834..fb3a55f85 100644 --- a/npc/001-5/worker.txt +++ b/npc/001-5/worker.txt @@ -2,7 +2,7 @@ // Author: Jesusalva // Workers from Worker Day. -001-5,23,73,0 script Soren NPC_CONSTR_WORKER,{ +001-5,23,73,0 script Livio NPC_CONSTR_WORKER,{ mesn; mesq l("You can get @@ anywhere, although here is a little easier to get.", getitemlink(Pearl)); next; diff --git a/npc/functions/array.txt b/npc/functions/array.txt index d9fc43bab..9e4035a70 100644 --- a/npc/functions/array.txt +++ b/npc/functions/array.txt @@ -191,7 +191,7 @@ function script array_sort_asc { // array_sort_desc(<array>) // sorts the array. Index always 0 -function script array_sort_dessc { +function script array_sort_desc { .@asc = getarg(1, true); .@size = getarraysize(getarg(0)); diff --git a/npc/functions/event.txt b/npc/functions/event.txt index 28f2610c9..5e3edca84 100644 --- a/npc/functions/event.txt +++ b/npc/functions/event.txt @@ -333,7 +333,7 @@ function script sThanksgiving { mes l("You got %d %s!", .@p, getitemlink(HeroCoin)); break; case 8: // MERC - .@p=any(MercCard_GonzoDark, MercCard_Rosa, MercCard_Soren, MercCard_Apane); + .@p=any(MercCard_GonzoDark, MercCard_Rosa, MercCard_Meway, MercCard_Apane); .@p=(#THANKS_STREAK > 7 ? any(MercCard_EarthWitch, MercCard_Demure, MercCard_Jesusalva, MercCard_Pookie) : .@p); .@p=(#THANKS_STREAK > 14 ? any(MercCard_Arthur, MercCard_LawnCable, MercCard_Crazyfefe, MercCard_Saulc) : .@p); .@p=(#THANKS_STREAK > 21 ? any(MercCard_Swezanne, MercCard_DragonStar, MercCard_Msawis, MercCard_Aisen) : .@p); diff --git a/npc/items/mercenary.txt b/npc/items/mercenary.txt index 140d3887b..2d820658b 100644 --- a/npc/items/mercenary.txt +++ b/npc/items/mercenary.txt @@ -42,7 +42,7 @@ function script merc_boxset { .@n=any_of(.@r); // 1 ★ } else { - setarray .@r, MercCard_Apane, MercCard_Soren, MercCard_GonzoDark, MercCard_Rosa; + setarray .@r, MercCard_Apane, MercCard_Meway, MercCard_GonzoDark, MercCard_Rosa; .@n=any_of(.@r); } @@ -138,7 +138,7 @@ function script merc_getstar { case MercBoxA: case MercBoxAA: case MercCard_Apane: - case MercCard_Soren: + case MercCard_Meway: case MercCard_GonzoDark: case MercCard_Rosa: return 1; |