Skip to content

Commit 1ec635a

Browse files
committed
Fixes #11
Fixed Glide Suit's inability to stop (if you could get it started) Rebalanced/Optimized Crossbow Rebalanced Terrible Terror AI Rebalanced Night Fury AI Fixed Dragon Damage Source naming Fixed incorrectly named Jack'o'Lantern name
1 parent ed23c52 commit 1ec635a

File tree

9 files changed

+15
-14
lines changed

9 files changed

+15
-14
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ idea {
2424

2525
apply plugin: 'forge'
2626

27-
version = "1.7.10-10.13.2.1230F-1.0.1R"
27+
version = "1.7.10-10.13.2.1230F-1.0.2R"
2828
group= "com.httymd" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
2929
archivesBaseName = "HTTYMD"
3030

java/com/httymd/entity/dragon/EntityNightFury.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public EntityNightFury(World world) {
3737
// Ground
3838
this.tasks.addTask(1, new EntityAISwimming(this));
3939
this.tasks.addTask(2, new EntityAIAttackOnCollide(this, 1.0D, true));
40-
this.tasks.addTask(3, new EntityAIFollowOwner(this, 1.3D, 50F, 5F));
40+
this.tasks.addTask(4, new EntityAIFollowOwner(this, 1.1D, 8F, 40F));
4141
this.tasks.addTask(4, new EntityAITempt(this, 0.5, Items.fish, true));
4242
this.tasks.addTask(4, new EntityAIMate(this, 1.0D));
4343
this.tasks.addTask(5, new EntityAIWander(this, 1.0D));

java/com/httymd/entity/dragon/EntityTerribleTerror.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public EntityTerribleTerror(World world) {
3232
this.tasks.addTask(1, new EntityAISwimming(this));
3333
this.tasks.addTask(2, new EntityAILeapAtTarget(this, 0.4F));
3434
this.tasks.addTask(3, new EntityAIAttackOnCollide(this, 0.8D, false));
35-
this.tasks.addTask(4, new EntityAIFollowOwner(this, 1.1D, 30F, 5F));
35+
this.tasks.addTask(4, new EntityAIFollowOwner(this, 1.1D, 5F, 20F));
3636
this.tasks.addTask(5, new EntityAITempt(this, 0.6D, Items.fish, true));
3737
this.tasks.addTask(6, new EntityAIMate(this, 1.0D));
3838
this.tasks.addTask(7, new EntityAIWander(this, 0.8D));

java/com/httymd/item/ItemGlideArmor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ protected int[] getRequiredSlotsForFlight() {
3333

3434
public boolean isFlyable(EntityLivingBase entity) {
3535
boolean flag = entity != null
36-
&& (!entity.onGround || !entity.isInWater() || !entity.isInsideOfMaterial(Material.lava));
37-
36+
&& (!entity.onGround && !entity.isInWater() && !entity.isInsideOfMaterial(Material.lava));
37+
3838
if (entity instanceof EntityPlayer)
39-
flag = flag && ((EntityPlayer) entity).capabilities.isFlying;
40-
39+
flag = flag && !((EntityPlayer) entity).capabilities.isFlying;
40+
4141
for (int slot : this.getRequiredSlotsForFlight()) {
4242
ItemStack armor = entity.getEquipmentInSlot(slot + 1);
4343
flag = flag && (armor != null && armor.getItem() instanceof ItemGlideArmor);
@@ -46,7 +46,7 @@ public boolean isFlyable(EntityLivingBase entity) {
4646
}
4747

4848
public boolean canGlide(EntityLivingBase entity, ItemStack stack) {
49-
boolean flag = !entity.isClientWorld() && this.isFlyable(entity)
49+
boolean flag = this.isFlyable(entity)
5050
&& ((entity.motionY < -1.0 && entity.moveForward >= 0.1 && entity.isSneaking())
5151
|| this.isGliding(stack));
5252
return flag;

java/com/httymd/item/ItemWeaponCrossbow.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public class ItemWeaponCrossbow extends ItemExtension {
3232
public static final String NBT_POWER = "BowStoredPower";
3333

3434
public static final float RESET_POWER = 0.0F;
35+
public static final float MAX_POWER = 1.7F;
3536

3637
public final ArrayList<String> iconList = new ArrayList<String>();
3738

@@ -146,16 +147,16 @@ public void onStopUsing(ItemStack item, World world, EntityLivingBase entity, in
146147

147148
durationDelta = event.charge;
148149
if (pullInventory(entity, item, Items.arrow)) {
149-
float arrowPower = (float) durationDelta / 20;
150+
float arrowPower = (float) (durationDelta * 0.05F);
150151
arrowPower = ((arrowPower * arrowPower + arrowPower * 2) / 3) * 2;
151152

152153
if ((double) arrowPower < 0.1D) {
153154
insertToInventory(entity, new ItemStack(Items.arrow));
154155
return;
155156
}
156157

157-
if (arrowPower > 2) {
158-
arrowPower = 2;
158+
if (arrowPower > MAX_POWER) {
159+
arrowPower = MAX_POWER;
159160
}
160161

161162
this.setBowPower(item, arrowPower);

java/com/httymd/util/DragonDamageSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static EntityDamageSource getProjectileFireDamage(Entity attacker, Entity
3535
}
3636

3737
public static EntityDamageSource getDirectDamage(Entity attacker) {
38-
return new EntityDamageSource(Utils.getModString("dragon.direct." + rng.nextInt(2)+1), attacker);
38+
return new EntityDamageSource(Utils.getModString("dragon.direct." + Integer.toString(rng.nextInt(2)+1)), attacker);
3939
}
4040

4141
}
807 KB
Binary file not shown.

resources/assets/httymd/lang/en_US.lang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ httymd:name.random.murderer=%s the Murderer
112112
httymd:name.random.nut=%s the Nut
113113
httymd:name.random.jerk=%s the Jerk
114114
httymd:name.random.melon=%s the Melon
115-
httymd:name.random.jackolatern=%s the Jack'o'Latern
115+
httymd:name.random.jackolatern=%s the Jack'o'Lantern
116116
httymd:name.random.blind=%s the Blind
117117
httymd:name.random.crazy=%s the Crazy
118118
httymd:name.random.freak=%s the Freak

resources/mcmod.info

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"modid": "httymd",
33
"name": "How to Train Your Minecraft Dragon",
44
"description": "The Mod based on How to Train your Dragon (movie) which adds everything from the franchise. From small daggers to Boss Dragons and everything in betweens. Try out Hiccups Glide Suit or the Crossbow, or you could fly your very own, loyal dragon named what you want them to.",
5-
"version": "1.0.1",
5+
"version": "1.0.2",
66
"mcversion": "${mcversion}",
77
"url": "",
88
"updateUrl": "",

0 commit comments

Comments
 (0)