diff options
| -rw-r--r-- | db/constants.conf | 4 | ||||
| -rw-r--r-- | db/re/item_db.conf | 3 | ||||
| -rw-r--r-- | npc/020-7-1/janitors.txt | 2 | ||||
| -rw-r--r-- | npc/020-7-1/pagefinders.txt | 2 | ||||
| -rw-r--r-- | npc/020-7-1/sage.txt | 2 | ||||
| -rw-r--r-- | npc/020-7/elias.txt | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/db/constants.conf b/db/constants.conf index 881dbfa45..2d89b0f25 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -4034,7 +4034,9 @@ constants_db: { NPC_SAGRATHA: 193 NPC_BLUESAGEWORKER_MA: 194 NPC_BLUESAGEWORKER_FA: 195 - NPC_BLUESAGE: 199 + NPC_BLUESAGEWORKER_MB: 196 + NPC_BLUESAGEWORKER_FB: 197 + NPC_BLUESAGE: 198 // LoF Non Animated NPCs NPC_FORTIUN: 200 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 77aa61996..ccc200585 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -11019,7 +11019,8 @@ item_db: ( bonus bHealPower,100; bonus bHealPower2,100; - if (strcharinfo(0) != "Jesus Saves" && BaseLevel < 255) { + // Equipment use is free after level 255 or during tests + if ($@GM_OVERRIDE && BaseLevel < 255) { bonus bNoRegen,1; bonus2 bSPLossRate,(255-BaseLevel)/30,(1000-(BaseLevel*2)); bonus2 bHPLossRate,(255-BaseLevel)/40,(1000-(BaseLevel*2)); diff --git a/npc/020-7-1/janitors.txt b/npc/020-7-1/janitors.txt index 1163a2a1c..199a90b8e 100644 --- a/npc/020-7-1/janitors.txt +++ b/npc/020-7-1/janitors.txt @@ -6,7 +6,7 @@ // In charge to clear the mess // helperCleaning* + helperJanitor -020-7-1,50,63,6 script Pyry NPC_BLUESAGEWORKER_MA,{ +020-7-1,50,63,6 script Pyry NPC_BLUESAGEWORKER_MB,{ npctalk3 l("I warn about dangers and controls the fights."); goodbye; end; diff --git a/npc/020-7-1/pagefinders.txt b/npc/020-7-1/pagefinders.txt index 011239e99..1ee4ca6fc 100644 --- a/npc/020-7-1/pagefinders.txt +++ b/npc/020-7-1/pagefinders.txt @@ -6,7 +6,7 @@ // Responsible for recovering the lost pages // helperBookpages* -020-7-1,36,39,4 script Ensio NPC_BLUESAGEWORKER_MA,{ +020-7-1,36,39,4 script Ensio NPC_BLUESAGEWORKER_MB,{ npctalk3 l("Collects book pages"); goodbye; end; diff --git a/npc/020-7-1/sage.txt b/npc/020-7-1/sage.txt index eccff6122..fba75e0d2 100644 --- a/npc/020-7-1/sage.txt +++ b/npc/020-7-1/sage.txt @@ -7,7 +7,7 @@ // Peetu: Move to 020-7 (so, not on this file) -// Oskari: Need to be placed somewhere here (on this file) +// Oskari: Need to be placed somewhere here (on this file, variant B) 020-7-1,35,59,0 script The Blue Sage NPC_BLUESAGE,{ .@cindy=($@CINDY_STATE < gettimetick(2)); diff --git a/npc/020-7/elias.txt b/npc/020-7/elias.txt index 51b694325..d91da461c 100644 --- a/npc/020-7/elias.txt +++ b/npc/020-7/elias.txt @@ -26,7 +26,7 @@ OnTouch: end; } -020-7,40,41,0 script Elias NPC_BLUESAGEWORKER_MA,{ +020-7,40,41,0 script Elias NPC_BLUESAGEWORKER_MB,{ mesn; mesq l("Hello, and welcome to Blue Sage's Residence, Library, and Nivalis Townhall."); // TODO |