Skip to content

Commit 0edeecb

Browse files
committed
Buffed Zot a little
1 parent 374727f commit 0edeecb

File tree

47 files changed

+10975
-48
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+10975
-48
lines changed

.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

.idea/caches/gradle_models.ser

7.22 KB
Binary file not shown.

.idea/libraries/Gradle__com_github_RohitSurwase_UCE_Handler_uce_handler_1_4_aar.xml

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/app.iml

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
</content>
9090
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
9191
<orderEntry type="sourceFolder" forTests="false" />
92+
<orderEntry type="library" name="Gradle: com.github.RohitSurwase.UCE-Handler:uce_handler:1.4@aar" level="project" />
9293
<orderEntry type="library" name="Gradle: android-android-29" level="project" />
9394
</component>
9495
</module>

app/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ android {
1616
}
1717
}
1818
}
19+
dependencies {
20+
implementation 'com.github.RohitSurwase.UCE-Handler:uce_handler:1.4'
21+
}

app/build/generated/not_namespaced_r_class_sources/debug/r/com/github/dachhack/sprout/R.java

+10,836-2
Large diffs are not rendered by default.

app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml

+14
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<!-- android:xlargeScreens="true" -->
2222
<application
2323
android:allowBackup="false"
24+
android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
2425
android:debuggable="true"
2526
android:icon="@drawable/ic_launcher"
2627
android:label="@string/app_name"
@@ -35,6 +36,19 @@
3536
<category android:name="android.intent.category.LAUNCHER" />
3637
</intent-filter>
3738
</activity>
39+
<activity
40+
android:name="com.rohitss.uceh.UCEDefaultActivity"
41+
android:process=":error_activity" />
42+
43+
<provider
44+
android:name="com.rohitss.uceh.UCEFileProvider"
45+
android:authorities="com.github.smujamesb.hardersprouted.provider"
46+
android:exported="false"
47+
android:grantUriPermissions="true" >
48+
<meta-data
49+
android:name="android.support.FILE_PROVIDER_PATHS"
50+
android:resource="@xml/provider_paths" />
51+
</provider>
3852
</application>
3953

4054
</manifest>
Binary file not shown.

app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml

+14
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<!-- android:xlargeScreens="true" -->
2323
<application
2424
android:allowBackup="false"
25+
android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
2526
android:debuggable="true"
2627
android:icon="@drawable/ic_launcher"
2728
android:label="@string/app_name"
@@ -36,6 +37,19 @@
3637
<category android:name="android.intent.category.LAUNCHER" />
3738
</intent-filter>
3839
</activity>
40+
<activity
41+
android:name="com.rohitss.uceh.UCEDefaultActivity"
42+
android:process=":error_activity" />
43+
44+
<provider
45+
android:name="com.rohitss.uceh.UCEFileProvider"
46+
android:authorities="com.github.smujamesb.hardersprouted.provider"
47+
android:exported="false"
48+
android:grantUriPermissions="true" >
49+
<meta-data
50+
android:name="android.support.FILE_PROVIDER_PATHS"
51+
android:resource="@xml/provider_paths" />
52+
</provider>
3953
</application>
4054

4155
</manifest>
Binary file not shown.

app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

+67-41
Original file line numberDiff line numberDiff line change
@@ -7,58 +7,84 @@
77
7
88
8 <uses-sdk
99
9 android:minSdkVersion="14"
10-
9-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml
10+
9-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml
1111
10 android:targetSdkVersion="29" />
12-
10-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml
12+
10-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml
1313
11
1414
12 <uses-permission android:name="android.permission.VIBRATE" />
15-
12-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:8:5-65
16-
12-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:8:22-63
15+
12-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:8:5-65
16+
12-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:8:22-63
1717
13
1818
14 <uses-feature android:glEsVersion="0x00020000" />
19-
14-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:10:2-11:40
20-
14-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:11:6-38
19+
14-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:10:2-11:40
20+
14-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:11:6-38
2121
15
2222
16 <supports-screens
23-
16-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:13:2-16:35
23+
16-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:13:2-16:35
2424
17 android:largeScreens="true"
25-
17-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:16:6-33
25+
17-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:16:6-33
2626
18 android:normalScreens="true"
27-
18-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:15:6-34
27+
18-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:15:6-34
2828
19 android:smallScreens="false" />
29-
19-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:14:6-34
29+
19-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:14:6-34
3030
20
3131
21 <!-- android:xlargeScreens="true" -->
3232
22 <application
33-
22-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:19:2-34:16
33+
22-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:19:2-34:16
3434
23 android:allowBackup="false"
35-
23-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:23:3-30
36-
24 android:debuggable="true"
37-
25 android:icon="@drawable/ic_launcher"
38-
25-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:20:3-39
39-
26 android:label="@string/app_name"
40-
26-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:21:3-35
41-
27 android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" >
42-
27-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:22:3-67
43-
28 <activity
44-
28-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:24:3-32:14
45-
29 android:name="com.github.dachhack.sprout.ShatteredPixelDungeon"
46-
29-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:26:4-41
47-
30 android:label="@string/app_name"
48-
30-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:25:4-36
49-
31 android:screenOrientation="portrait" >
50-
31-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:27:4-40
51-
32 <intent-filter>
52-
32-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:28:4-31:20
53-
33 <action android:name="android.intent.action.MAIN" />
54-
33-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:29:5-57
55-
33-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:29:13-54
56-
34
57-
35 <category android:name="android.intent.category.LAUNCHER" />
58-
35-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:30:5-65
59-
35-->F:\SproutedPixelDungeon-Gradle-master\app\src\main\AndroidManifest.xml:30:15-62
60-
36 </intent-filter>
61-
37 </activity>
62-
38 </application>
63-
39
64-
40</manifest>
35+
23-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:23:3-30
36+
24 android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
37+
24-->[com.android.support:support-compat:28.0.0] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\f14724208b5bfeeef0d6bdefe649bca7\support-compat-28.0.0\AndroidManifest.xml:22:18-91
38+
25 android:debuggable="true"
39+
26 android:icon="@drawable/ic_launcher"
40+
26-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:20:3-39
41+
27 android:label="@string/app_name"
42+
27-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:21:3-35
43+
28 android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" >
44+
28-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:22:3-67
45+
29 <activity
46+
29-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:24:3-32:14
47+
30 android:name="com.github.dachhack.sprout.ShatteredPixelDungeon"
48+
30-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:26:4-41
49+
31 android:label="@string/app_name"
50+
31-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:25:4-36
51+
32 android:screenOrientation="portrait" >
52+
32-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:27:4-40
53+
33 <intent-filter>
54+
33-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:28:4-31:20
55+
34 <action android:name="android.intent.action.MAIN" />
56+
34-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:29:5-57
57+
34-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:29:13-54
58+
35
59+
36 <category android:name="android.intent.category.LAUNCHER" />
60+
36-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:30:5-65
61+
36-->F:\harder-sprouted-pd\app\src\main\AndroidManifest.xml:30:15-62
62+
37 </intent-filter>
63+
38 </activity>
64+
39 <activity
65+
39-->[com.github.RohitSurwase.UCE-Handler:uce_handler:1.4] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\d20cdc3922786a3d9d9a5eefe0523eca\uce_handler-1.4\AndroidManifest.xml:12:9-14:49
66+
40 android:name="com.rohitss.uceh.UCEDefaultActivity"
67+
40-->[com.github.RohitSurwase.UCE-Handler:uce_handler:1.4] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\d20cdc3922786a3d9d9a5eefe0523eca\uce_handler-1.4\AndroidManifest.xml:13:13-63
68+
41 android:process=":error_activity" />
69+
41-->[com.github.RohitSurwase.UCE-Handler:uce_handler:1.4] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\d20cdc3922786a3d9d9a5eefe0523eca\uce_handler-1.4\AndroidManifest.xml:14:13-46
70+
42
71+
43 <provider
72+
43-->[com.github.RohitSurwase.UCE-Handler:uce_handler:1.4] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\d20cdc3922786a3d9d9a5eefe0523eca\uce_handler-1.4\AndroidManifest.xml:16:9-24:20
73+
44 android:name="com.rohitss.uceh.UCEFileProvider"
74+
44-->[com.github.RohitSurwase.UCE-Handler:uce_handler:1.4] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\d20cdc3922786a3d9d9a5eefe0523eca\uce_handler-1.4\AndroidManifest.xml:17:13-60
75+
45 android:authorities="com.github.smujamesb.hardersprouted.provider"
76+
45-->[com.github.RohitSurwase.UCE-Handler:uce_handler:1.4] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\d20cdc3922786a3d9d9a5eefe0523eca\uce_handler-1.4\AndroidManifest.xml:18:13-60
77+
46 android:exported="false"
78+
46-->[com.github.RohitSurwase.UCE-Handler:uce_handler:1.4] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\d20cdc3922786a3d9d9a5eefe0523eca\uce_handler-1.4\AndroidManifest.xml:19:13-37
79+
47 android:grantUriPermissions="true" >
80+
47-->[com.github.RohitSurwase.UCE-Handler:uce_handler:1.4] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\d20cdc3922786a3d9d9a5eefe0523eca\uce_handler-1.4\AndroidManifest.xml:20:13-47
81+
48 <meta-data
82+
48-->[com.github.RohitSurwase.UCE-Handler:uce_handler:1.4] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\d20cdc3922786a3d9d9a5eefe0523eca\uce_handler-1.4\AndroidManifest.xml:21:13-23:58
83+
49 android:name="android.support.FILE_PROVIDER_PATHS"
84+
49-->[com.github.RohitSurwase.UCE-Handler:uce_handler:1.4] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\d20cdc3922786a3d9d9a5eefe0523eca\uce_handler-1.4\AndroidManifest.xml:22:17-67
85+
50 android:resource="@xml/provider_paths" />
86+
50-->[com.github.RohitSurwase.UCE-Handler:uce_handler:1.4] C:\Users\samue\.gradle\caches\transforms-2\files-2.1\d20cdc3922786a3d9d9a5eefe0523eca\uce_handler-1.4\AndroidManifest.xml:23:17-55
87+
51 </provider>
88+
52 </application>
89+
53
90+
54</manifest>
Binary file not shown.

app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

+14
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<!-- android:xlargeScreens="true" -->
2222
<application
2323
android:allowBackup="false"
24+
android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
2425
android:debuggable="true"
2526
android:icon="@drawable/ic_launcher"
2627
android:label="@string/app_name"
@@ -35,6 +36,19 @@
3536
<category android:name="android.intent.category.LAUNCHER" />
3637
</intent-filter>
3738
</activity>
39+
<activity
40+
android:name="com.rohitss.uceh.UCEDefaultActivity"
41+
android:process=":error_activity" />
42+
43+
<provider
44+
android:name="com.rohitss.uceh.UCEFileProvider"
45+
android:authorities="com.github.smujamesb.hardersprouted.provider"
46+
android:exported="false"
47+
android:grantUriPermissions="true" >
48+
<meta-data
49+
android:name="android.support.FILE_PROVIDER_PATHS"
50+
android:resource="@xml/provider_paths" />
51+
</provider>
3852
</application>
3953

4054
</manifest>

app/debug/app-debug.apk

1.42 MB
Binary file not shown.

app/src/main/java/com/github/dachhack/sprout/ShatteredPixelDungeon.java

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.github.dachhack.sprout.scenes.GameScene;
3030
import com.github.dachhack.sprout.scenes.PixelScene;
3131
import com.github.dachhack.sprout.scenes.TitleScene;
32+
import com.rohitss.uceh.UCEHandler;
3233
import com.watabou.noosa.Game;
3334
import com.watabou.noosa.audio.Music;
3435
import com.watabou.noosa.audio.Sample;
@@ -70,6 +71,9 @@ protected void onCreate(Bundle savedInstanceState) {
7071
* | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY ); }
7172
*/
7273

74+
75+
new UCEHandler.Builder(this).build();
76+
7377
updateImmersiveMode();
7478

7579
DisplayMetrics metrics = new DisplayMetrics();

app/src/main/java/com/github/dachhack/sprout/actors/hero/HeroClass.java

+3
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
import com.github.dachhack.sprout.items.scrolls.ScrollOfIdentify;
7676
import com.github.dachhack.sprout.items.scrolls.ScrollOfMagicMapping;
7777
import com.github.dachhack.sprout.items.scrolls.ScrollOfMagicalInfusion;
78+
import com.github.dachhack.sprout.items.scrolls.ScrollOfMirrorImage;
7879
import com.github.dachhack.sprout.items.scrolls.ScrollOfPsionicBlast;
7980
import com.github.dachhack.sprout.items.scrolls.ScrollOfRemoveCurse;
8081
import com.github.dachhack.sprout.items.scrolls.ScrollOfUpgrade;
@@ -352,6 +353,8 @@ public static void playtest(Hero hero) {
352353
new Boomerang().enchant(new Slashing()).identify().collect();
353354
}
354355

356+
new ScrollOfMirrorImage().collect();
357+
355358
//spork.reinforce().upgrade(15).identify().collect();
356359

357360
//Towel towel = new Towel();

app/src/main/java/com/github/dachhack/sprout/actors/mobs/LitTower.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public void zapAll(int loc){
153153

154154
Char hero=Dungeon.hero;
155155

156-
int mobDmg=Random.Int(300, 600);
156+
int mobDmg=Random.Int(100, 600);
157157

158158

159159
boolean visible = Level.fieldOfView[pos] || Level.fieldOfView[loc];
@@ -169,7 +169,8 @@ public void zapAll(int loc){
169169
hero.sprite.centerEmitter().burst(SparkParticle.FACTORY, 3);
170170
hero.sprite.flash();
171171

172-
Camera.main.shake(2, 0.3f);
172+
Camera.main.shake(2, 1f);
173+
GLog.n("The lightning towers are too strong. Perhaps you can disable them by going to the right?");
173174
}
174175

175176
@Override

app/src/main/java/com/github/dachhack/sprout/actors/mobs/Mob.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ public int defenseSkill(Char enemy) {
394394
@Override
395395
public int defenseProc(Char enemy, int damage) {
396396
if (!(enemySeen && enemy == Dungeon.hero)) {
397-
if (((Hero) enemy).subClass == HeroSubClass.ASSASSIN) {
397+
if (enemy instanceof Hero && ((Hero) enemy).subClass == HeroSubClass.ASSASSIN) {
398398
damage *= 1.5f;
399399
Wound.hit(this);
400400
} else {

build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ buildscript {
1414

1515
allprojects {
1616
repositories {
17+
maven { url 'https://jitpack.io' }
1718
jcenter()
1819
maven {
1920
url 'https://maven.google.com/'

SproutedPixelDungeon-Gradle-master.iml harder-sprouted-pd.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id="SproutedPixelDungeon-Gradle-master" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="harder-sprouted-pd" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>

0 commit comments

Comments
 (0)