Revert "Make coupon item stackable" until test is fixed

This reverts commit f0a8054.
arianne · Oct 16, 2023 · 7de145d · 7de145d
1 parent f0a8054
commit 7de145d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/data/conf/items/documents.xml b/data/conf/items/documents.xml
@@ -22,7 +22,9 @@
   <item name="coupon">
     <type class="documents" subclass="coupon" tileid="-1"/>
     <description>You see a coupon.</description>
-    <implementation class-name="games.stendhal.server.entity.item.StackableItem"/>
+    <!-- FIXME: `games.stendhal.server.entity.item.ItemTest` copy constructor test fails -->
+    <!--<implementation class-name="games.stendhal.server.entity.item.StackableItem"/>-->
+    <implementation class-name="games.stendhal.server.entity.item.Item"/>
     <attributes>
     </attributes>
     <weight value="0.01"/>

diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
@@ -13,7 +13,6 @@ Changelog
   - Nation Crusher: Finish Kill Bordroughs quest 250 times
   - Semos's Ruler: Finish daily monster quest 1,000 times
 - seeds & bulbs items have unique images
-- made coupon item stackable
 
 
 1.44

diff --git a/src/games/stendhal/client/entity/factory/EntityMap.java b/src/games/stendhal/client/entity/factory/EntityMap.java
@@ -155,7 +155,8 @@ private static void register() {
 		register("item", "jewellery", null, StackableItem.class);
 
 		register("item", "token", null, Item.class);
-		register("item", "documents", "coupon", StackableItem.class);
+		// FIXME: `games.stendhal.server.entity.item.ItemTest` copy constructor test fails
+		//~ register("item", "documents", "coupon", StackableItem.class);
 
 		register("portal", null, null, Portal.class);
 		register("house_portal", null, null, HousePortal.class);

diff --git a/src/games/stendhal/client/gui/j2d/entity/EntityViewFactory.java b/src/games/stendhal/client/gui/j2d/entity/EntityViewFactory.java
@@ -187,7 +187,8 @@ private static void configure() {
 		register("item", "ammunition", null, StackableItem2DView.class);
 		register("item", "container", null, StackableItem2DView.class);
 		register("item", "special", null, StackableItem2DView.class);
-		register("item", "documents", "coupon", StackableItem2DView.class);
+		// FIXME: `games.stendhal.server.entity.item.ItemTest` copy constructor test fails
+		//~ register("item", "documents", "coupon", StackableItem2DView.class);
 
 		register("item", "club", "wizard_staff", UseableItem2DView.class);
 		register("item", "misc", "seed", UseableItem2DView.class);

diff --git a/tests/games/stendhal/client/gui/j2d/entity/EntityViewFactoryTest.java b/tests/games/stendhal/client/gui/j2d/entity/EntityViewFactoryTest.java
@@ -1,6 +1,6 @@
 /* $Id$ */
 /***************************************************************************
- *                   (C) Copyright 2003-2010 - Stendhal                    *
+ *                   (C) Copyright 2003-2023 - Stendhal                    *
  ***************************************************************************
  ***************************************************************************
  *                                                                         *
@@ -58,7 +58,7 @@ public final void testCreate() {
 
 		assertEquals(EntityViewFactory.getViewClass("area", null, null),  InvisibleEntity2DView.class);
 
-	    assertEquals(EntityViewFactory.getViewClass("item", "special", "mithril clasp"), Item2DView.class);
+		assertEquals(EntityViewFactory.getViewClass("item", "special", "mithril clasp"), Item2DView.class);
 		assertEquals(EntityViewFactory.getViewClass("item", "crystal", null),  Item2DView.class);
 		assertEquals(EntityViewFactory.getViewClass("item", null, null),  Item2DView.class);
 		assertEquals(EntityViewFactory.getViewClass("npc", null, null), NPC2DView.class);
@@ -90,11 +90,13 @@ public final void testCreate() {
 		assertEquals(EntityViewFactory.getViewClass("item", "missile", null),  StackableItem2DView.class);
 		assertEquals(EntityViewFactory.getViewClass("item", "ammunition", null),  StackableItem2DView.class);
 		assertEquals(EntityViewFactory.getViewClass("item", "container", null),  StackableItem2DView.class);
-        assertEquals(EntityViewFactory.getViewClass("item", "special", null),  StackableItem2DView.class);
+		// FIXME: `games.stendhal.server.entity.item.ItemTest` copy constructor test fails
+		//~ assertEquals(EntityViewFactory.getViewClass("item", "documents", "coupon"),  StackableItem2DView.class);
+		assertEquals(EntityViewFactory.getViewClass("item", "special", null),  StackableItem2DView.class);
 
 
 		assertEquals(EntityViewFactory.getViewClass("item", "club", "wizard_staff"),  UseableItem2DView.class);
-        assertEquals(EntityViewFactory.getViewClass("item", "misc", "seed"), UseableItem2DView.class);
+		assertEquals(EntityViewFactory.getViewClass("item", "misc", "seed"), UseableItem2DView.class);
 
 		assertEquals(EntityViewFactory.getViewClass("item", "scroll", null),  UseableItem2DView.class);