From b77a31e7f7415800533001e8069802526f7551e8 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sat, 18 Jun 2016 20:54:22 -0400
Subject: [PATCH] v0.4.0: adjusted the effect of clobber

---
 AndroidManifest.xml                                           | 4 ++--
 .../shatteredpixeldungeon/actors/buffs/Combo.java             | 2 +-
 .../shatteredpixeldungeon/messages/actors/actors.properties   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 99f68bdc2..dd46f74a9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.shatteredpixel.shatteredpixeldungeon"
-	android:versionCode="101"
-	android:versionName="0.4.0-BETA-2"
+	android:versionCode="104"
+	android:versionName="0.4.0-BETA-3"
 	android:installLocation="auto">
 
 	<uses-permission android:name="android.permission.VIBRATE"/>
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
index d6252e1a8..9a19840c5 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
@@ -252,7 +252,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
 								}
 							}
 						}
-						Buff.prolong(enemy, Paralysis.class, Random.NormalIntRange(1, 4));
+						Buff.prolong(enemy, Vertigo.class, Random.NormalIntRange(1, 4));
 					}
 					break;
 				case SLAM:
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties
index cea18e723..03cf97307 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties
@@ -77,8 +77,8 @@ actors.buffs.chill.desc=Not quite frozen, but still much too cold.\n\nChilled ta
 actors.buffs.combo.name=Combo
 actors.buffs.combo.combo=%d hit combo!
 actors.buffs.combo.bad_target=You must target an enemy in attack range.
-actors.buffs.combo.clobber_prompt=Select a target to Clobber\nStuns and knocks back
-actors.buffs.combo.clobber_desc=_Clobber_ is currently available. This attack _knocks an enemy back and stuns them,_ but deals reduced damage. It's excellent for buying a little time during a fight.
+actors.buffs.combo.clobber_prompt=Select a target to Clobber\nDazes and knocks back
+actors.buffs.combo.clobber_desc=_Clobber_ is currently available. This attack _knocks an enemy back and dazes them,_ but deals reduced damage. It's excellent for buying a little time during a fight.
 actors.buffs.combo.cleave_prompt=Select a target to Cleave\nIf it kills, preserves combo
 actors.buffs.combo.cleave_desc=_Cleave_ is currently available. This attack deals increased damage, and _if it kills an enemy, it will preserve combo instead of resetting it._ It's great for building combo when fighting multiple enemies.
 actors.buffs.combo.slam_prompt=Select a target to Slam\nShields you based on damage