Merge remote-tracking branch 'shpd/master'

# Conflicts:
#	build.gradle
#	core/src/main/assets/messages/actors/actors.properties
#	core/src/main/java/com/zrp200/rkpd2/actors/Char.java
#	core/src/main/java/com/zrp200/rkpd2/actors/buffs/Levitation.java
#	core/src/main/java/com/zrp200/rkpd2/scenes/GameScene.java

SPD-classes/src/main/java/com/watabou/utils/Bundle.java

@@ -23,6 +23,7 @@
 
 import com.badlogic.gdx.utils.JsonReader;
 import com.badlogic.gdx.utils.JsonValue;
+import com.badlogic.gdx.utils.JsonWriter;
 import com.watabou.noosa.Game;
 
 import java.io.BufferedInputStream;
@@ -452,7 +453,7 @@ public static boolean write( Bundle bundle, OutputStream stream, boolean compres
 			if (compressed) writer = new BufferedWriter( new OutputStreamWriter( new GZIPOutputStream(stream, GZIP_BUFFER ) ) );
 			else writer = new BufferedWriter( new OutputStreamWriter( stream ) );
 
-			writer.write( bundle.toString() );
+			bundle.data.prettyPrint(JsonWriter.OutputType.json, writer);
 			writer.close();
 
 			return true;

SPD-classes/src/main/java/com/watabou/utils/DeviceCompat.java

@@ -71,4 +71,13 @@ public static void log( String tag, String message ){
 		Gdx.app.log( tag, message );
 	}
 
+	public static RectF getSafeInsets(){
+		RectF result = new RectF();
+		result.left =   Gdx.graphics.getSafeInsetLeft();
+		result.top =    Gdx.graphics.getSafeInsetTop();
+		result.right =  Gdx.graphics.getSafeInsetRight();
+		result.bottom = Gdx.graphics.getSafeInsetBottom();
+		return result;
+	}
+
 }

SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java

@@ -43,6 +43,10 @@ public void vibrate( int millis ){
 		Gdx.input.vibrate( millis );
 	}
 
+	public void setHonorSilentSwitch( boolean value ){
+		//does nothing by default
+	}
+
 	//TODO should consider spinning this into its own class, rather than platform support getting ever bigger
 	protected static HashMap<FreeTypeFontGenerator, HashMap<Integer, BitmapFont>> fonts;
 

SPD-classes/src/main/java/com/watabou/utils/Rect.java

@@ -148,6 +148,10 @@ public Rect shrink() {
 		return shrink( 1 );
 	}
 
+	public Rect scale( int d ){
+		return new Rect( left * d, top * d, right * d, bottom * d );
+	}
+
 	public ArrayList<Point> getPoints() {
 		ArrayList<Point> points = new ArrayList<>();
 		for (int i = left; i <= right; i++)

SPD-classes/src/main/java/com/watabou/utils/RectF.java

@@ -143,5 +143,9 @@ public RectF shrink( float d ) {
 	public RectF shrink() {
 		return shrink( 1 );
 	}
+
+	public RectF scale( float d ){
+		return new RectF( left * d, top * d, right * d, bottom * d );
+	}
 
 }

build.gradle

@@ -5,8 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
-        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.13'
+        classpath 'com.android.tools.build:gradle:7.0.4'
     }
 }
 

core/src/main/assets/messages/actors/actors.properties

@@ -727,7 +727,7 @@ actors.hero.talent.enhanced_rings.title=enhanced rings
 actors.hero.talent.enhanced_rings.desc=_+1:_ When the Rogue uses an artifact, his rings gains +2 upgrades for _3 turns_.\n\n_+2:_ When the Rogue uses an artifact, his rings gain +2 upgrades for _6 turns_.\n\n_+3:_ When the Rogue uses an artifact, his rings gain +2 upgrades for _9 turns_.\n\n"While Rogue might not get the +4 natural ring bonus that he gets in Rat King Dungeon, this is pretty damn close. Equipping two rings of the same type will make that dream a reality."
 actors.hero.talent.enhanced_lethality.title=enhanced lethality
 # TODO add message
-actors.hero.talent.enhanced_lethality.desc=_+1:_ The Assassin can assassinate enemies below _4/13/27/67% health_ per level of preparation, up from 3/10/20/50%.\n\n_+2:_ The Assassin can assassinate enemies below _5/17/30/83% health_ per level of preparation, up from 3/10/20/50%.\n\n_+3:_ The Assassin can assassinate enemies below _6/20/40/100% health_ per level of preparation, up from 3/10/20/50%.
+actors.hero.talent.enhanced_lethality.desc=_+1:_ The Assassin can assassinate enemies below _4/13/27/67% health_ per level of preparation, up from 3/10/20/50%.\n\n_+2:_ The Assassin can assassinate enemies below _5/17/33/83% health_ per level of preparation, up from 3/10/20/50%.\n\n_+3:_ The Assassin can assassinate enemies below _6/20/40/100% health_ per level of preparation, up from 3/10/20/50%.
 actors.hero.talent.assassins_reach.title=assassin's reach
 actors.hero.talent.assassins_reach.desc=_+1:_ The Assassin's blink range per level of preparation is increased to _2/3/5/6 tiles_, from 1/2/3/4.\n\n_+2:_ The Assassin's blink range per level of preparation is increased to _3/5/7/10 tiles_, from 1/2/3/4.\n\n_+3:_ The Assassin's blink range per level of preparation is increased to _4/7/10/14 tiles_, from 1/2/3/4.\n\n"I am inevitable."\n- You after blinking 10 tiles to oneshot that scorpio.
 actors.hero.talent.bounty_hunter.title=bounty hunter
@@ -1137,7 +1137,7 @@ actors.mobs.dwarfking.golem=Rat King doesn't have access to these!
 actors.mobs.dwarfking.golem_rat_king=I've prepared these special, JUST FOR YOU!!!!
 actors.mobs.dwarfking.first_special_rat_king=Unlike in your pathetic kingdom, my minions actually obey me!
 actors.mobs.dwarfking.corrupted=HOW CAN THIS BE?! How dare that %s choose the inferior king! You will pay!!!
-actors.mobs.dwarfking.lifelink_1=I need of your essence, slave!
+actors.mobs.dwarfking.lifelink_1=I have need of your essence, slave!
 actors.mobs.dwarfking.lifelink_2=Bleed for me, slave!
 actors.mobs.dwarfking.teleport_1=Deal with them, slave!
 actors.mobs.dwarfking.teleport_rat_king=Show him my power!!!