teambeef/doom3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/Doom3Quest.git synced 2025-04-25 00:21:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tweaks to get haptics playing correctly

Browse source
This commit is contained in:
Simon 2021-03-21 11:32:15 +00:00
parent f97d73435e
commit 66cd8b6533
3 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Projects/Android/build.gradle
View file

@ -42,6 +42,11 @@ android {
}
compileSdkVersion = 24
buildToolsVersion = '29.0.1'
/* buildTypes {
release {
debuggable true
}
}*/
}
dependencies {

2
Projects/Android/jni/d3es-multithread-master/neo/game/Player.cpp
View file

@ -12525,7 +12525,7 @@ void idPlayer::Damage( idEntity *inflictor, idEntity *attacker, const idVec3 &di
StartSound( "snd_burn", SND_CHANNEL_BODY3, 0, false, NULL );
if ( IsType( idPlayer::Type ) ) {
common->HapticEvent("fire", 0, 0, damage * 4, 0, 0);
common->HapticEvent("fire", 0, 0, 50, 0, 0);
}
} else if ( damageDef->dict.GetBool( "no_air" ) ) {

37
java/com/drbeef/doom3quest/bhaptics/bHaptics.java
View file

@ -424,8 +424,8 @@ public class bHaptics {
private static String getHapticEventKey(String event) {
String key = event.toLowerCase();
if (event.contains("melee")) {
if (event.contains("right"))
if (key.contains("melee")) {
if (key.contains("right"))
{
key = "melee_right";
}
@ -433,42 +433,45 @@ public class bHaptics {
{
key = "melee_left";
}
} else if (event.contains("damage") && event.contains("bullet")) {
} else if (key.contains("damage") && key.contains("bullet")) {
key = "bullet";
} else if (event.contains("damage") && event.contains("fireball")) {
key = "fireball";
} else if (event.contains("damage") && event.contains("rocket")) {
} else if (key.contains("damage") && key.contains("splash")) {
key = "bullet"; // damage from a nearby exploding projectile, just use simple bullet pattern for now
} else if (key.contains("damage") &&
(key.contains("fireball") ||
key.contains("rocket") ||
key.contains("explode"))) {
key = "fireball"; // Just re-use this one
} else if (event.contains("damage") && event.contains("noair")) {
} else if (key.contains("damage") && key.contains("noair")) {
key = "noair";
} else if (event.contains("damage") && event.contains("shotgun")) {
} else if (key.contains("damage") && key.contains("shotgun")) {
key = "shotgun";
} else if (event.contains("damage") && event.contains("fall")) {
} else if (key.contains("damage") && key.contains("fall")) {
key = "fall";
} else if (event.contains("door") || event.contains("panel"))
} else if (key.contains("door") || key.contains("panel"))
{
if (event.contains("close"))
if (key.contains("close"))
{
key = "doorclose";
}
else if (event.contains("open"))
else if (key.contains("open"))
{
key = "dooropen";
}
} else if (event.contains("lift"))
} else if (key.contains("lift"))
{
if (event.contains("up"))
if (key.contains("up"))
{
key = "liftup";
}
else if (event.contains("down"))
else if (key.contains("down"))
{
key = "liftdown";
}
} else if (event.contains("elevator"))
} else if (key.contains("elevator"))
{
key = "machine";
} else if (event.contains("entrance_scanner") || event.contains("scanner_rot1s"))
} else if (key.contains("entrance_scanner") || key.contains("scanner_rot1s"))
{
key = "scan";
}