[CF-Devel] CVS update: client

Crossfire CVS devel mwedel at scruznet.com
Thu Jul 20 01:49:32 CDT 2000


Date:	Wednesday July 19, 2000 @ 23:49
Author:	cvs

Update of /home/cvs/CVS/client
In directory boltzmann.eecs.berkeley.edu:/tmp/cvs-serv8912

Modified Files:
	item_types item_types.h player.c 
Log Message:
item_types, item_types.h:  Update with new item types - MSW 7/19/2000

player.c: Comment out command buffering output - MSW 7/19/2000



****************************************

Index: client/item_types
diff -u client/item_types:1.2 client/item_types:1.3
--- client/item_types:1.2	Sat Apr 22 00:08:55 2000
+++ client/item_types	Wed Jul 19 23:49:32 2000
@@ -13,6 +13,9 @@
 # is better to put them at a later number so more specific matches will
 # happen first.
 #
+# While this has not been done for all categories, please try to order
+# the entries for each category (number) in alphabetical order.
+#
 # containers
 # Moved containers to the top - this is because of stuff like quiver of
 # arrows, but also more convenient
@@ -27,25 +30,34 @@
 key ring
 # Weapon types
 2:
-sword
-mace
-hammer
-Dragonslayer
+axe
+club
+dagger
+Darkblade
 Demonslayer
-Trident
+Dragonslayer
+falchion
 Flame Tongue
+FlameTongue
+hammer
+katana
 Lightning sticks
-Stormbringer
-dagger
-quarterstaff
-club
-axe
+mace
 magnifying glass
-spear
 morningstar
-taifu
-scimitar
+Mournblade
+nunchacu
+quarterstaff
 sabre
+scimitar
+shovel
+spear
+stake
+sword
+Stormbringer
+taifu
+Trident
+trident
 3:
 bow
 crossbow
@@ -59,8 +71,12 @@
 leather
 robe
 shirt
+apron
+# Headware
 11:
 helmet
+Crown
+crown
 12:
 shield
 13:
@@ -76,27 +92,34 @@
 bracer
 # food
 20:
-food
-waybread
-roast bird
-water
+apple
 booze
+bread
 cabbage
+cake
 carrot
 chocolate
 clover
-mint sprig
-bread
-cake
+cup 
+egg
 fish
-steak
-apple
+food
+mint sprig
+mushroom
+onion
+orange
 potato
+roast bird
+steak
+waybread
+water
+# gems
 30:
-ruby
 diamond
-pearl
 emerald
+gold nugget
+pearl
+ruby
 sapphire
 31:
 coin
@@ -112,45 +135,67 @@
 53:
 amulet
 54:
-ring 
-a ring
+ring
+Ring 
 55:
 scroll
+# Spellbooks
 56:
 grimore
-treatise
+grimoire
+hymnal
 manual
-tome
+prayerbook
+sacred text
 spellbook
+testiment
+treatise
+tome
+# Readables.  Note we included the generic book here.
 57:
-lab book
-guidebook
-notebook
+book
+catalog
+codex
+collection
+compendium
+compilation
+divine work
+encyclopedia
+exposition
+file 
 formulary
-tables
-recipe book
-pamphlet
-lab notes
-handbook
 guide 
-cookbook
+holy book 
+holy record 
+index
+moral text
+notes
+note
+pamphlet
+record 
+tables
+transcript
+volume
 59:
 potion
+bottle
 61:
 balm 
 dust 
+figurine
 # Item building scrolls
 63:
 Improve
 Lower Weapon
 Enchant Weapon
 Prepare Weapon
-Enchant Armor
+Enchant Armour
 # Misc skill objects
 65:
+holy symbol
+lockpick
 talisman
 writing pen
-lockpick
 67:
 key
 Key
@@ -158,24 +203,36 @@
 # body parts
 #
 70:
-pixie dust
+arm
 claw
-ectoplasm
 corpse
-wing
-residue
-lich dust
+dragon scale
+ectoplasm
+eye
+foot
+hand
+head
 heart
+icor
+leg
+lich dust
 liver
 orc chop
+pixie dust
+residue
+skin
 stinger
-beholdereye
-head
-hand
-foot
+tongue
+tooth
+wing
 # Misc alchemy items (minerals)
 71:
 dirt
+lead
+mandrake root
+pile
+rock
+stone
 #
 80:
 flint and steel
@@ -184,6 +241,12 @@
 # Misc stuff - just to prevent error messages
 #
 90:
-icecube
+clock
+flower
+Gate Pass
 Glowing Crystal
+gravestone
+icecube
 library card
+Port Pass
+rose
Index: client/item_types.h
diff -u client/item_types.h:1.2 client/item_types.h:1.3
--- client/item_types.h:1.2	Sat Apr 22 00:08:55 2000
+++ client/item_types.h	Wed Jul 19 23:49:32 2000
@@ -8,7 +8,7 @@
 static char *item_types[256][64] = {
 { NULL }, 
 { "sack", "Luggage", "pouch", "quiver", "bag", "chest", "key ring", NULL }, 
-{ "sword", "mace", "hammer", "Dragonslayer", "Demonslayer", "Trident", "Flame Tongue", "Lightning sticks", "Stormbringer", "dagger", "quarterstaff", "club", "axe", "magnifying glass", "spear", "morningstar", "taifu", "scimitar", "sabre", NULL }, 
+{ "axe", "club", "dagger", "Darkblade", "Demonslayer", "Dragonslayer", "falchion", "Flame Tongue", "FlameTongue", "hammer", "katana", "Lightning sticks", "mace", "magnifying glass", "morningstar", "Mournblade", "nunchacu", "quarterstaff", "sabre", "scimitar", "shovel", "spear", "stake", "sword", "Stormbringer", "taifu", "Trident", "trident", NULL }, 
 { "bow", "crossbow", "sling", "arrow", "bolt", "boulder", NULL }, 
 { NULL }, 
 { NULL }, 
@@ -16,8 +16,8 @@
 { NULL }, 
 { NULL }, 
 { NULL }, 
-{ "mail", "leather", "robe", "shirt", NULL }, 
-{ "helmet", NULL }, 
+{ "mail", "leather", "robe", "shirt", "apron", NULL }, 
+{ "helmet", "Crown", "crown", NULL }, 
 { "shield", NULL }, 
 { "boot", "glove", "gauntlet", "shoe", NULL }, 
 { "girdle", NULL }, 
@@ -26,7 +26,7 @@
 { NULL }, 
 { NULL }, 
 { NULL }, 
-{ "food", "waybread", "roast bird", "water", "booze", "cabbage", "carrot", "chocolate", "clover", "mint sprig", "bread", "cake", "fish", "steak", "apple", "potato", NULL }, 
+{ "apple", "booze", "bread", "cabbage", "cake", "carrot", "chocolate", "clover", "cup ", "egg", "fish", "food", "mint sprig", "mushroom", "onion", "orange", "potato", "roast bird", "steak", "waybread", "water", NULL }, 
 { NULL }, 
 { NULL }, 
 { NULL }, 
@@ -36,7 +36,7 @@
 { NULL }, 
 { NULL }, 
 { NULL }, 
-{ "ruby", "diamond", "pearl", "emerald", "sapphire", NULL }, 
+{ "diamond", "emerald", "gold nugget", "pearl", "ruby", "sapphire", NULL }, 
 { "coin", NULL }, 
 { NULL }, 
 { NULL }, 
@@ -60,24 +60,24 @@
 { "wand", "staff", NULL }, 
 { "horn", NULL }, 
 { "amulet", NULL }, 
-{ "ring ", "a ring", NULL }, 
+{ "ring", "Ring ", NULL }, 
 { "scroll", NULL }, 
-{ "grimore", "treatise", "manual", "tome", "spellbook", NULL }, 
-{ "lab book", "guidebook", "notebook", "formulary", "tables", "recipe book", "pamphlet", "lab notes", "handbook", "guide ", "cookbook", NULL }, 
+{ "grimore", "grimoire", "hymnal", "manual", "prayerbook", "sacred text", "spellbook", "testiment", "treatise", "tome", NULL }, 
+{ "book", "catalog", "codex", "collection", "compendium", "compilation", "divine work", "encyclopedia", "exposition", "file ", "formulary", "guide ", "holy book ", "holy record ", "index", "moral text", "notes", "note", "pamphlet", "record ", "tables", "transcript", "volume", NULL }, 
 { NULL }, 
-{ "potion", NULL }, 
+{ "potion", "bottle", NULL }, 
 { NULL }, 
-{ "balm ", "dust ", NULL }, 
+{ "balm ", "dust ", "figurine", NULL }, 
 { NULL }, 
-{ "Improve", "Lower Weapon", "Enchant Weapon", "Prepare Weapon", "Enchant Armor", NULL }, 
+{ "Improve", "Lower Weapon", "Enchant Weapon", "Prepare Weapon", "Enchant Armour", NULL }, 
 { NULL }, 
-{ "talisman", "writing pen", "lockpick", NULL }, 
+{ "holy symbol", "lockpick", "talisman", "writing pen", NULL }, 
 { NULL }, 
 { "key", "Key", NULL }, 
 { NULL }, 
 { NULL }, 
-{ "pixie dust", "claw", "ectoplasm", "corpse", "wing", "residue", "lich dust", "heart", "liver", "orc chop", "stinger", "beholdereye", "head", "hand", "foot", NULL }, 
-{ "dirt", NULL }, 
+{ "arm", "claw", "corpse", "dragon scale", "ectoplasm", "eye", "foot", "hand", "head", "heart", "icor", "leg", "lich dust", "liver", "orc chop", "pixie dust", "residue", "skin", "stinger", "tongue", "tooth", "wing", NULL }, 
+{ "dirt", "lead", "mandrake root", "pile", "rock", "stone", NULL }, 
 { NULL }, 
 { NULL }, 
 { NULL }, 
@@ -96,7 +96,7 @@
 { NULL }, 
 { NULL }, 
 { NULL }, 
-{ "icecube", "Glowing Crystal", "library card", NULL }, 
+{ "clock", "flower", "Gate Pass", "Glowing Crystal", "gravestone", "icecube", "library card", "Port Pass", "rose", NULL }, 
 { NULL }, 
 { NULL }, 
 { NULL }, 
Index: client/player.c
diff -u client/player.c:1.3 client/player.c:1.4
--- client/player.c:1.3	Sun Jun 13 15:19:52 1999
+++ client/player.c	Wed Jul 19 23:49:32 2000
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_player_c =
- *   "$Id: player.c,v 1.3 1999/06/13 22:19:52 cvs Exp $";
+ *   "$Id: player.c,v 1.4 2000/07/20 06:49:32 cvs Exp $";
  */
  
 #include <client.h>
@@ -187,8 +187,10 @@
 	 * the same, drop it
 	 */
 	if (commdiff>cpl.command_window && !must_send && !strcmp(command, last_command)) {
+#if 0 /* Obnoxious warning message we don't need */
 	    fprintf(stderr,"Wont send command %s - window oversized %d %d\n",
 		    command, csocket.command_sent, csocket.command_received);
+#endif
 	}
 	else {
 	    SockList sl;

    
    


More information about the crossfire mailing list