diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-12 09:21:42 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-12 09:21:42 -0400 |
| commit | 641a0062bdde6d187a0c5bd5c7956ba47ed322cc (patch) | |
| tree | 6afc1c58f4f09222bae7e0db27c393e5ac579887 /world/map | |
| parent | 1f5cb5b8f93c9931c32393c2d69a739ae2f1c3d3 (diff) | |
| download | serverdata-641a0062bdde6d187a0c5bd5c7956ba47ed322cc.tar.gz serverdata-641a0062bdde6d187a0c5bd5c7956ba47ed322cc.tar.bz2 serverdata-641a0062bdde6d187a0c5bd5c7956ba47ed322cc.tar.xz serverdata-641a0062bdde6d187a0c5bd5c7956ba47ed322cc.zip | |
leftovers
Diffstat (limited to 'world/map')
| -rw-r--r-- | world/map/npc/029-2/alchemy.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/055-1/pumpkins.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/magic/_procedures.txt | 14 | ||||
| -rw-r--r-- | world/map/npc/magic/level0-wand.txt | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/world/map/npc/029-2/alchemy.txt b/world/map/npc/029-2/alchemy.txt index 3d49d5ae..b5e4732c 100644 --- a/world/map/npc/029-2/alchemy.txt +++ b/world/map/npc/029-2/alchemy.txt @@ -71,8 +71,6 @@ L_Abort: S_Spawn: set .@s, getarraysize(.x1); - if (.spawned == 0) - set .spawned, 1; // FIXME: in tmwa (getarraysize2, setarray) allow to set array index 0 when setting in another npc if (.spawned >= .@s) goto S_Return; set .@n$, "#_Al-lab"+chr(3)+.spawned; diff --git a/world/map/npc/055-1/pumpkins.txt b/world/map/npc/055-1/pumpkins.txt index 64b145c8..eff97b2e 100644 --- a/world/map/npc/055-1/pumpkins.txt +++ b/world/map/npc/055-1/pumpkins.txt @@ -122,7 +122,7 @@ S_Return: return; OnHeartbeat: - set .i, 1; // object iterator + set .i, 0; // object iterator freeloop 1; callsub S_IterateObjects; freeloop 0; diff --git a/world/map/npc/magic/_procedures.txt b/world/map/npc/magic/_procedures.txt index df750f73..466d8ca8 100644 --- a/world/map/npc/magic/_procedures.txt +++ b/world/map/npc/magic/_procedures.txt @@ -54,6 +54,7 @@ function|script|melee_damage function|script|magic_create_item { + // FIXME / XXX: IMO, using Luk for this is very bad and unfair set .@exp, (MAGIC_EXPERIENCE & (BYTE_0_MASK | BYTE_1_MASK)) >> BYTE_0_SHIFT; set .@score, (.@exp + rand(min(@spellpower, ((.@exp / 3) + 1)))); set @create_params[2], 1; // success flag @@ -92,12 +93,12 @@ function|script|magic_exp set @last_index, (MAGIC_EXPERIENCE & BYTE_2_MASK) >> BYTE_2_SHIFT; set @last_exp, (MAGIC_EXPERIENCE & (BYTE_0_MASK | BYTE_1_MASK)) >> BYTE_0_SHIFT; - debugmes "old spell index: " + @last_index; - debugmes "new spell index: " + .index; + //debugmes "old spell index: " + @last_index; + //debugmes "new spell index: " + .index; if(getskilllv(SKILL_MAGIC) < (.level + 3) && .index != @last_index) goto L_Gain; - debugmes "same as last spell => don't proceed"; + //debugmes "same as last spell => don't proceed"; goto L_Return; L_Gain: @@ -107,8 +108,8 @@ L_Gain: // spell with no costs and still get the exp set @new_exp, @last_exp + .exp_gain; if(@new_exp > (BYTE_0_MASK | BYTE_1_MASK)) set @new_exp, (BYTE_0_MASK | BYTE_1_MASK); - debugmes "old magic exp: "+ @last_exp; - debugmes "new magic exp: "+ @new_exp; + //debugmes "old magic exp: "+ @last_exp; + //debugmes "new magic exp: "+ @new_exp; set MAGIC_EXPERIENCE, (MAGIC_EXPERIENCE &~ (BYTE_0_MASK | BYTE_1_MASK)) | (@new_exp << BYTE_0_SHIFT); set MAGIC_EXPERIENCE, (MAGIC_EXPERIENCE &~ BYTE_2_MASK) | (.index << BYTE_2_SHIFT); goto L_Return; @@ -124,8 +125,7 @@ function|script|adjust_spellpower if(@args$ == "" || !@args$ || getpartnerid2() == 0) goto L_Return; if(getcharid(3, @args$) < 1 || getpartnerid2() != getcharid(3, @args$) || !(isloggedin(getcharid(3, @args$)))) goto L_Return; - debugmes "You targeted your spouse!"; - // XXX: I need a builtin to check if the target is in range of the caster + //debugmes "You targeted your spouse!"; // XXX: the spell power increases when the target is the spouse so one could // just do #modrilax (spouse) right? // diff --git a/world/map/npc/magic/level0-wand.txt b/world/map/npc/magic/level0-wand.txt index 1a512c0c..07fbb025 100644 --- a/world/map/npc/magic/level0-wand.txt +++ b/world/map/npc/magic/level0-wand.txt @@ -60,7 +60,7 @@ S_LowSp: L_Failed: //misceffect FX_ELECTRICITY_RED, strcharinfo(0); // XXX: do we show an effect on fail? - debugmes "cast or attack failed"; + //debugmes "cast or attack failed"; end; OnInit: |