summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2024-05-02 12:59:43 -0300
committerJesusaves <cpntb1@ymail.com>2024-05-02 12:59:43 -0300
commite7823df99608721a002e18aa21a5af3fb096f0dc (patch)
tree8702b7967d0f2ec4ae016c05a77209f6d50a592b
parentdfce21e0ecedad3126ac5ad7272761736eb16a20 (diff)
downloadserverdata-e7823df99608721a002e18aa21a5af3fb096f0dc.tar.gz
serverdata-e7823df99608721a002e18aa21a5af3fb096f0dc.tar.bz2
serverdata-e7823df99608721a002e18aa21a5af3fb096f0dc.tar.xz
serverdata-e7823df99608721a002e18aa21a5af3fb096f0dc.zip
Ishi: Add guard for reborn players
-rw-r--r--npc/003-1/ishi.txt1
-rw-r--r--npc/006-9/ctrl.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt
index ed16ed362..c666a05f5 100644
--- a/npc/003-1/ishi.txt
+++ b/npc/003-1/ishi.txt
@@ -14,6 +14,7 @@
close;
}
if (BaseLevel < 10) {
+ if (REBIRTH) bye(E_UPSET); // Formulas break otherwise
// TODO: make jail stuff a function and replace this with the new function
dispbottom l("##1You abused a bug and will be jailed. If this was done in error, you have found a bug. Contact the nearest developer if this is the case.");
atcommand "@jailfor 5mn "+strcharinfo(0);
diff --git a/npc/006-9/ctrl.txt b/npc/006-9/ctrl.txt
index e6c752228..836e1c389 100644
--- a/npc/006-9/ctrl.txt
+++ b/npc/006-9/ctrl.txt
@@ -314,7 +314,7 @@ function spawn {
if (.diff % 4 == 1) {
// Visual aspect of the ascension
unittalk(.@lucky, "*This unit has ascended*");
- setunitdata(.@lucky, UDT_CLASS, Birb);
+ setunitdata(.@lucky, UDT_CLASS, Birb); // any(Birb, EntAbomination, Maverick) //, SpiderQueen, Yetifly, Moubootaur)
immortal(.@lucky); // Jump straight to "plain unkillable" levels
setunitdata(.@lucky, UDT_CRIT, 32767); // Always does criticals
// Retrieve some data