pull the globs outside the Meaty Sequence

update tiles textfile, too

diff --git a/src/objects.c b/src/objects.c
index 69be49aef649f121b1706a23bcd387ba5f1dc174..5dc51c695862b17172203f878e20113d2e292fd6 100644 (file)
--- a/src/objects.c
+++ b/src/objects.c
@@ -670,17 +670,17 @@ FOOD("meatball",             0, 1,  1, 0, FLESH,   5, CLR_BROWN),
 FOOD("meat stick",           0, 1,  1, 0, FLESH,   5, CLR_BROWN),
 FOOD("huge chunk of meat",   0,20,400, 0, FLESH,2000, CLR_BROWN),
 
-/* pudding 'corpses' will turn into these and combine */
-FOOD("glob of gray ooze",      0, 1,  1, 0, FLESH,   0, CLR_GRAY),
-FOOD("glob of brown pudding",  0, 1,  1, 0, FLESH,   0, CLR_BROWN),
-FOOD("glob of green slime",    0, 1,  1, 0, FLESH,   0, CLR_GREEN),
-FOOD("glob of black pudding",  0, 1,  1, 0, FLESH,   0, CLR_BLACK),
-
 /* special case because it's not mergable */
 OBJECT(OBJ("meat ring", (char *)0),
     BITS(1,0,0,0,0,0,0,0,0,0,0,0,FLESH),
     0, FOOD_CLASS, 0, 1, 5, 1, 0, 0, 0, 0, 5, CLR_BROWN),
 
+/* pudding 'corpses' will turn into these and combine */
+FOOD("glob of gray ooze",      0, 2, 10, 0, FLESH,   0, CLR_GRAY),
+FOOD("glob of brown pudding",  0, 2, 10, 0, FLESH,   0, CLR_BROWN),
+FOOD("glob of green slime",    0, 2, 10, 0, FLESH,   0, CLR_GREEN),
+FOOD("glob of black pudding",  0, 2, 10, 0, FLESH,   0, CLR_BLACK),
+
 /* fruits & veggies */
 FOOD("kelp frond",           0, 1,  1, 0, VEGGY,  30, CLR_GREEN),
 FOOD("eucalyptus leaf",      3, 1,  1, 0, VEGGY,  30, CLR_GREEN),

diff --git a/win/share/objects.txt b/win/share/objects.txt
index a4b6249f2182ccacf98156fd5fb0105386e693ca..5c9a69b73805f11f02c2f516c21aec0243ee543b 100644 (file)
--- a/win/share/objects.txt
+++ b/win/share/objects.txt
@@ -4707,7 +4707,26 @@ P = (108, 145, 182)
   MMMMMMMMMMMMMMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 247 (glob of gray ooze)
+# tile 247 (meat ring)
+{
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMOOOAMMMMMMM
+  MMMMOAAMOOAMMMMM
+  MMMMOAAMMMOAMMMM
+  MMMMMOAAMMMOAMMM
+  MMMMMOAAMMMOAMMM
+  MMMMMOAMMMMOAMMM
+  MMMMOAAAMMOAAMMM
+  MMMMMOOOOOAAMMMM
+  MMMMMMAAAAAMMMMM
+  MMMMMMMMMMMMMMMM
+}
+# tile 248 (glob of gray ooze)
 {
   MMMMMMMMMMMMMMMM
   MMMMMMMMMMMMMMMM
@@ -4726,7 +4745,7 @@ P = (108, 145, 182)
   MMMAAAMAAAAAMMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 248 (glob of brown pudding)
+# tile 249 (glob of brown pudding)
 {
   MMMMMMMMMMMMMMMM
   MMMMMMMMMMMMMMMM
@@ -4745,7 +4764,7 @@ P = (108, 145, 182)
   MMMAAAMAAAAAMMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 249 (glob of green slime)
+# tile 250 (glob of green slime)
 {
   MMMMMMMMMMMMMMMM
   MMMMMMMMMMMMMMMM
@@ -4764,7 +4783,7 @@ P = (108, 145, 182)
   MMMAAAMAAAAAMMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 250 (glob of black pudding)
+# tile 251 (glob of black pudding)
 {
   MMMMMMMMMMMMMMMM
   MMMMMMMMMMMMMMMM
@@ -4783,25 +4802,6 @@ P = (108, 145, 182)
   MMMAAAMAAAAAMMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 251 (meat ring)
-{
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMMOOOAMMMMMMM
-  MMMMOAAMOOAMMMMM
-  MMMMOAAMMMOAMMMM
-  MMMMMOAAMMMOAMMM
-  MMMMMOAAMMMOAMMM
-  MMMMMOAMMMMOAMMM
-  MMMMOAAAMMOAAMMM
-  MMMMMOOOOOAAMMMM
-  MMMMMMAAAAAMMMMM
-  MMMMMMMMMMMMMMMM
-}
 # tile 252 (kelp frond)
 {
   MMMMFAMMMMMMMMMM

diff --git a/win/share/renumtiles.pl b/win/share/renumtiles.pl
index f7748d064f7e70def0fc000123ac0aaae3ea3801..0220484e2ab2d3782058117c842cadc51a6d949f 100644 (file)
--- a/win/share/renumtiles.pl
+++ b/win/share/renumtiles.pl
@@ -8,6 +8,7 @@ sub bail($);
 
 use Getopt::Std;
 
+# TODO: switch to Getopt::Long so we can parse normal arguments too
 $Getopt::Std::STANDARD_HELP_VERSION = TRUE;
 $main::VERSION = 1.0;
 
@@ -52,7 +53,7 @@ exit;
 sub main::HELP_MESSAGE()
 {
     print <<"STARTHELP";
-Usage: renumtiles.pl [OPTIONS]
+Usage: renumtiles.pl [OPTIONS] <textfile>
 
 STARTHELP
     foreach $cmd (keys(%commands)) {