diff options
| -rw-r--r-- | conf/map/battle/player.conf | 2 | ||||
| -rw-r--r-- | db/re/map_zone_db.conf | 2 | ||||
| -rw-r--r-- | npc/001-6/mapflags.txt | 1 | ||||
| -rw-r--r-- | npc/014-2-2/gemini.txt | 18 | ||||
| -rw-r--r-- | npc/014-2-2/valia.txt | 3 | ||||
| -rw-r--r-- | npc/018-5-boss/mapflag.txt | 2 | ||||
| -rw-r--r-- | npc/042-0/arthur.txt | 2 | ||||
| -rw-r--r-- | npc/soren-2/mapflags.txt | 1 | ||||
| -rw-r--r-- | npc/soren/mapflags.txt | 1 |
9 files changed, 21 insertions, 11 deletions
diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf index 09388bbcf..395cf9408 100644 --- a/conf/map/battle/player.conf +++ b/conf/map/battle/player.conf @@ -135,7 +135,7 @@ max_def: 99 over_def_bonus: 0 // Max weight carts can hold. -max_cart_weight: 5000 +max_cart_weight: 10000 // Prevent logout of players after being hit for how long (in ms, 0 disables)? prevent_logout: 10000 diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf index 9ffbd0808..f1e9a3c90 100644 --- a/db/re/map_zone_db.conf +++ b/db/re/map_zone_db.conf @@ -117,10 +117,12 @@ zones: ( } disabled_items: { + RentCart: true } mapflags: ( "nopet", + "nostorage", "nopenalty", "nosave 000-1,22,22", ) diff --git a/npc/001-6/mapflags.txt b/npc/001-6/mapflags.txt index c6904baa8..ed451e666 100644 --- a/npc/001-6/mapflags.txt +++ b/npc/001-6/mapflags.txt @@ -1 +1,2 @@ 001-6 mapflag zone MMO +001-6 mapflag nopet diff --git a/npc/014-2-2/gemini.txt b/npc/014-2-2/gemini.txt index 54d404cf9..e577110a6 100644 --- a/npc/014-2-2/gemini.txt +++ b/npc/014-2-2/gemini.txt @@ -15,14 +15,16 @@ OnCoreInit: end; } // Disable the cart - if (isequipped(RentCart)) { - unequipbyid(RentCart); - setcart 0; - } - // Remove the cart - if (countitem(RentCart)) { - delitem RentCart, countitem(RentCart); - dispbottom l("The %s was destroyed!", getitemlink(RentCart)); + if ($HARDCORE) { + if (isequipped(RentCart)) { + unequipbyid(RentCart); + setcart 0; + } + // Remove the cart + if (countitem(RentCart)) { + delitem RentCart, countitem(RentCart); + dispbottom l("The %s was destroyed!", getitemlink(RentCart)); + } } .@p = getcharid(1); instance_attach($@VALIA_INST[.@p]); diff --git a/npc/014-2-2/valia.txt b/npc/014-2-2/valia.txt index 8c4a677fc..bb6de298c 100644 --- a/npc/014-2-2/valia.txt +++ b/npc/014-2-2/valia.txt @@ -129,7 +129,8 @@ function script GeminiKill { } // Alright. mesq l("Good. I hope you have stocked everything. The time limit is 4 hours."); - mesc l("* All party members' carts will be destroyed if you warp."), 1; + if ($HARDCORE) + mesc l("* All party members' carts will be destroyed if you warp."), 1; // Only first attempt is free - all others are charged if ($EVENT$ != "Gemini" || diff --git a/npc/018-5-boss/mapflag.txt b/npc/018-5-boss/mapflag.txt index 918e92251..2e3293e36 100644 --- a/npc/018-5-boss/mapflag.txt +++ b/npc/018-5-boss/mapflag.txt @@ -1,3 +1,5 @@ 018-5-boss mapflag zone No Tricks 018-5-0 mapflag nopet 018-5-1 mapflag nopet +018-5-0 mapflag nostorage +018-5-1 mapflag nostorage diff --git a/npc/042-0/arthur.txt b/npc/042-0/arthur.txt index 452861612..745f6cefc 100644 --- a/npc/042-0/arthur.txt +++ b/npc/042-0/arthur.txt @@ -322,7 +322,7 @@ OnTouch: .@g=getcharid(2); // Cart Restriction - if (countitem(RentCart)) { + if (countitem(RentCart) && $HARDCORE) { dispbottom l("I cannot enter Kamelot with a cart."); end; } diff --git a/npc/soren-2/mapflags.txt b/npc/soren-2/mapflags.txt index c3091c00c..a33b6bc10 100644 --- a/npc/soren-2/mapflags.txt +++ b/npc/soren-2/mapflags.txt @@ -1 +1,2 @@ soren-2 mapflag zone MMO +soren-2 mapflag nopet diff --git a/npc/soren/mapflags.txt b/npc/soren/mapflags.txt index f38cb43db..777bc0f73 100644 --- a/npc/soren/mapflags.txt +++ b/npc/soren/mapflags.txt @@ -1 +1,2 @@ soren mapflag zone MMO +soren mapflag nopet |