Changeset 426

Timestamp:

08/01/07 14:00:18 (1 year ago)

Author:

takkaria

Message:

#316:

• Move Detection staffs to be rods, also Probing
  
• Tweak rarities of rods/staffs a little
  

Files:

• trunk/lib/edit/limits.txt (modified) (1 diff)
• trunk/lib/edit/object.txt (modified) (10 diffs)
• trunk/src/load.c (modified) (1 diff)

trunk/lib/edit/limits.txt

@@ -46 +46 @@
-
-# Maximum number of flavors
-0
+1
-
-# Maximum number of spells

trunk/lib/edit/object.txt

@@ -2424 +2424 @@
-## XXX 299 XXX ##
-
+## XXX 300 Staff of Trap Location XXX ##
+
+
+##### Lazy Rods
+
+N:300:Treasure Location
+G:-:d
+I:66:28:0
+W:5:0:50:400
+A:100:5 to 100
+E:DET_GOLD:35
+
+N:302:Object Location
+G:-:d
+I:66:29:0
+W:5:0:50:200
+A:100:5 to 100
+E:DET_OBJ:35
+
-
-##### Staffs #####
-
-N:300:Trap Location
-G:_:d
-I:55:12:0
-W:10:0:50:350
-A:100:10 to 100
-P:0:1d2:0:0:0
-C:6+d5
-E:DET_TRAP
-
-N:301:Treasure Location
-G:_:d
-I:55:10:0
-W:5:0:50:200
-A:100:5 to 100
-P:0:1d2:0:0:0
-C:8+d20
-E:DET_GOLD
-
-N:302:Object Location
-G:_:d
-I:55:11:0
-W:5:0:50:200
-A:100:5 to 100
-P:0:1d2:0:0:0
-C:6+d15
-E:DET_OBJ
-
-N:303:Teleportation
@@ -2476 +2468 @@
-I:55:3:0
-W:10:0:50:0
-10
+2
-P:0:1d2:0:0:0
-C:2d3
@@ -2512 +2504 @@
-I:55:2:0
-W:10:0:50:0
-10
+2
-P:0:1d2:0:0:0
-C:8+d8
@@ -2542 +2534 @@
-P:0:1d2:0:0:0
-C:6+d5
-#! now works like a real CLW effect
-E:CURE_LIGHT
-
@@ -2568 +2559 @@
-I:55:1:0
-W:40:0:50:0
-10
+5
-P:0:1d2:0:0:0
-C:8+d8
-E:SLOW
-
-
-
-
-
-
-
-
-
+
-
-N:317:Remove Curse
@@ -2618 +2602 @@
-E:DISPEL_EVIL60
-
-
-
-
-
-
-
-
-
+
-
-N:322:Darkness
@@ -2631 +2608 @@
-I:55:0:0
-W:5:0:50:0
-100:5 to 2
+80:5 to 1
-P:0:1d2:0:0:0
-C:8+d8
@@ -2697 +2674 @@
-P:0:1d2:0:0:0
-C:1+d2
-#! now cures poison, blindness, conf also
-E:CURE_FULL
-
@@ -2884 +2860 @@
-I:66:1:0
-W:15:0:15:1000
-5
+0
-P:0:1d1:0:0:0
-F:EASY_KNOW
@@ -2901 +2877 @@
-G:-:d
-I:66:7:0
-40
-25:40
+35
+70:35
-P:0:1d1:0:0:0
-F:EASY_KNOW

trunk/src/load.c

@@ -166 +166 @@
-
-                        break;
+                }
+
+                /* Some staffs removed, replace with rods */
+                case TV_STAFF:
+                {
+                        int new_sval = 0;
+
+                        /* Treasure location */
+                        if (*sval == 10) new_sval = 28;
+
+                        /* Object location */
+                        if (*sval == 11) new_sval = 29;
+
+                        /* Door/stair location */
+                        if (*sval == 13) new_sval = 1;
+
+                        /* Probing */
+                        if (*sval == 23) new_sval = 7;
+
+                        if (new_sval != *sval)
+                        {
+                                *tval = TV_ROD;
+                                *sval = new_sval;
+                        }
-                }
-        }