twisty 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d1c6f5160edae8ea6546a7858d9c68f39f54bae7cfab52ba5d483e0faf43b1b
-  data.tar.gz: eb9bfd5c67a756f49731365b2f69e012dad7594bbd535965123c6ef077ebef47
+  metadata.gz: 2b0ea8c345e6ea4ed78af2a8e810b9a1e14e089c2476ec856fc1296235788d9a
+  data.tar.gz: 1f660ec8ef3648c85773938d64aee14e0e7226a5c9e09ff565faa224b9b93c06
 SHA512:
-  metadata.gz: 3f4e57b0c880495d354cca48bf6a0738dde66045782677d3ec855799046818a81924674c2a0281a53e671753629aeccf838264cbba970b7e7b8b6eb36e093f82
-  data.tar.gz: ac822566e63604ec5539a567c2c5e0b0e3eab0d6509339b3a7ba7d6efa4acbe6e4dc7ffb51acbdff7d16f2d4daaafd15fc8eebd67aaa6a582d5487f157cf0175
+  metadata.gz: 318c11d11366ed2ff2038bac20a6a74aa34a28987fe66cceff1adcdbd0fc7bff9f329341e15673da457981074239a274b8e68fe0ce1b8280e4c4caebe802538c
+  data.tar.gz: 4ab0d97ff5d71a4d38bfa8d6d7c64a803fad446abe98e6fa785f2af1c26bc0d32733fdc9bfb8a88a0a870c17b87eb11293fc8956145e8c09e31d1f9aabd632d9

data/lib/twisty/engine.rb

@@ -216,57 +216,65 @@ class Engine
 		@inventory
 	end
 
-	##########################
-	#   Game play commands   #
-	##########################
-	rtype [String] => nil
-	#The "take item" command. Probably best not to call directly
+	rtype [String] => Symbol
+	#(+Symbol+)
 	#
-	#name:: (+String+) Name of an Item the player has typed in
-	def take_item_by_name(name)
+	#Returns Index of the Item of the same name in the current room
+	def find_in_current_room(name)
 		current_items.each do |id|
 			if @items.has_key? id
 				if @items[id].name.downcase == name.downcase
-					take_item_by_id(id)
-					return nil
+					return id
 				end
 			else
 				raise GameError.new "Invalid Item #{id} in #{@current_room}"
 			end
 		end
 
-		#Implicit error condition
-		raise PlayError.new "There is no #{name} here"
-		return nil
+		#Could not be found
+		raise PlayError.new "I see no #{name}"
+		return :nil #Never reached
 	end
 
-	rtype [Symbol] => nil
-	#Called by Engine.take_item_by_name. Probably best not to call directly
+	rtype [String] => Symbol
+	#(+Symbol+)
 	#
-	#id:: (+Symbol+) Index entry for the Item to be removed from the current
-	#     room and placed in the player's inventory as found by
-	#     Engine.take_item_by_name()
-	def take_item_by_id(id)
-		if @items.has_key? id
-			if current_items.include? id
-				if @items[id].fixed
-					raise PlayError.new "You can not move that"
-				else
-					if @items[id].take_event
-						current_room.items.delete id
-						@inventory << id
-					end
-
-					return nil
+	#Returns Index of the Item of the same name in the inventory
+	def find_in_inventory(name)
+		inventory.each do |id|
+			if @items.has_key? id
+				if @items[id].name.downcase == name.downcase
+					return id
 				end
 			else
-				raise GameError.new "There is no #{id} in #{@current_room}"
+				raise GameError.new "Invalid Item #{id} in inventory"
 			end
-		else
-			raise GameError.new "Invalid Item #{id} in #{@current_room}"
 		end
 
-		return nil
+		#Could not be found
+		raise PlayError.new "You are not carrying that"
+		return :nil
+	end
+
+	##########################
+	#   Game play commands   #
+	##########################
+	rtype [String] => nil
+	#The "take item" command. Probably best not to call directly
+	#
+	#name:: (+String+) Name of an Item the player has typed in
+	def take_item(name)
+		id = find_in_current_room(name)
+		if @items[id].fixed
+			raise PlayError.new "You can not move that"
+		else
+			if @items[id].take_event
+				current_room.items.delete id
+				@inventory << id
+			end
+
+			return nil
+		end
 	end
 
 	rtype [String, String] => nil
@@ -276,39 +284,24 @@ class Engine
 	#       inventory
 	#container:: (+String+) Name of an Item that the player is looking to
 	#            remove added to the another Item from
-	def take_from_by_name_name(item, container)
-		current_items.each do |id|
-			if @items[id].name.downcase == container
-				return take_from_by_name_id(item, id)
-			end
-		end
+	def take_from(item, container)
+		cId = find_in_current_room(container) #Container ID
 
-		#Implicit error
-		raise PlayError.new "I can not see any #{container} here"
-		return nil
-	end
+		@items[cId].contents.each do |iId|
+			if @items.has_key? iId
+				if @items[iId].name.downcase == item.downcase
+					if @items[cId].take_content_event(iId) and @items[iId].take_event
+						@items[cId].del_item iId
+						@inventory << iId
 
-	rtype [String, Symbol] => nil
-	#Called by take_from_by_name_name. Probably best not to call directly.
-	#
-	#item:: (+String+) Name that the player has typed for an item to be
-	#       added to the inventory
-	#container:: (+Symbol+) Key for the containing Item as found by
-	#            Engine.take_from_by_name_name
-	def take_from_by_name_id(item, container)
-		@items[container].contents.each do |id|
-			if @items[id].name.downcase == item
-				if @items[container].take_content_event(id) and @items[id].take_event
-					@items[container].del_item id
-					@inventory << id
+						return nil
+					end
 				end
-
-				return nil
+			else
+				raise GameError.new "Invalid Item in container #{cId}"
 			end
 		end
 
-		#Implicit Error
-		raise PlayError.new "I see no #{item} in the #{@items[container].name}"
 		return nil
 	end
 
@@ -317,44 +310,19 @@ class Engine
 	#
 	#item:: (+String+) Name that the player has typed for an item to be
 	#       added to a container
-	def put_item_by_name_name(item, container)
-		@inventory.each do |id|
-			if @items[id].name.downcase == item
-				return put_item_by_id_name(id, container)
-			end
-		end
+	def put_item(item, container)
+		iId = find_in_inventory(item)
+		cId = find_in_current_room(container)
 
-		#Implicit Error
-		raise PlayError.new "You have no #{item}"
-		return nil
-	end
-
-	rtype [Symbol, String] => nil
-	#Called by Engine.put_item_by_name_name. Probably best not to call
-	#directly
-	#
-	#item:: (+Symbol+) Key in Engine.items of the item to be placed in the
-	#       container as found by Engine.put_item_by_name_name
-	#container:: (+String+) Name that the player has typed for the Item
-	#            to act as a container
-	def put_item_by_id_name(item, container)
-		current_items.each do |id|
-			if @items[id].name.downcase == container
-				if @items[id].storage == 0
-					raise PlayError.new "It won't fit in there"
-				end
-
-				if @items[id].put_content_event(item) and @items[item].drop_event
-					@items[id].add_item(item)
-					@inventory.delete item
-				end
+		if @items[cId].storage == 0
+			raise PlayError.new "It won't fit in there"
+		end
 
-				return nil
-			end
+		if @items[cId].put_content_event(id) and @items[iId].drop_event
+			@items[cId].add_item(iId)
+			@inventory.delete iId
 		end
 
-		#Implicit Error
-		raise PlayError.new "I see no #{item}"
 		return nil
 	end
 
@@ -363,42 +331,16 @@ class Engine
 	#
 	#name:: (+String+) The name, typed by the player, of the item to be
 	#dropped
-	def drop_item_by_name(name)
-		@inventory.each do |id|
-			if @items.has_key? id
-				if @items[id].name.downcase == name
-					drop_item_by_id(id)
-
-					return nil
-				end
-			else
-				raise GameError.new "Invalid Item: #{id}"
-			end
+	def drop_item(name)
+		id = find_in_inventory(name)
+		if @items[id].drop_event
+			current_room.items << id
+			@inventory.delete id
 		end
 
-		#Implicit error condition
-		raise PlayError.new "You are not carrying that"
 		return nil
 	end
 
-	rtype [Symbol] => nil
-	#Called by Engine.drop_item_by_name. Probably best not to call directly
-	#
-	#id:: (+Symbol+) Key in Engine.items of the item to be dropped as found
-	#by Engine.drop_item_by_name
-	def drop_item_by_id(id)
-		if @items.has_key? id
-			if @items[id].drop_event
-				current_room.items << id
-				@inventory.delete id
-			end
-
-			return nil
-		else
-			raise GameError.new "Invalid item: #{id} in inventory"
-		end
-	end
-
 	rtype [Symbol] => nil
 	#Called by the "walk door" command. Unlike current_room=(id) this
 	#triggers events and only moves the player if said events run

data/lib/twisty.rb

@@ -63,25 +63,25 @@ Engine.instance.define_command(
 	/^take \w+$/,
 	"take object",
 	"Take an object and carry it in your inventory") do |tokens|
-		engine.take_item_by_name(tokens[1])
+		engine.take_item(tokens[1])
 	end
 Engine.instance.define_command(
 	/^take \w+ from \w+$/,
 	"take object from container",
 	"Take an object out of a container and carry it your inventory") do |tokens|
-		engine.take_from_by_name_name(tokens[1], tokens[3])
+		engine.take_from(tokens[1], tokens[3])
 	end
 Engine.instance.define_command(
 	/^drop \w+$/,
 	"drop object",
 	"Remove an object from your inventory and leave it in the room") do |tokens|
-		engine.drop_item_by_name(tokens[1])
+		engine.drop_item(tokens[1])
 	end
 Engine.instance.define_command(
 	/^put \w+ in \w+$/,
 	"put item in container",
 	"Remove an object from your inventory and leave it in a container") do |tokens|
-		engine.put_item_by_name_name(tokens[1], tokens[3])
+		engine.put_item(tokens[1], tokens[3])
 	end
 Engine.instance.define_command(
 	/^walk \w+$/,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twisty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryan McCoskrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtype-native