Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IED Class Inheritance Fixes #1440

Merged
merged 7 commits into from
Jun 16, 2015
Merged

IED Class Inheritance Fixes #1440

merged 7 commits into from
Jun 16, 2015

Conversation

legman
Copy link
Contributor

@legman legman commented May 30, 2015

Improved the IED class inheritance fixing a bug where vanilla IEDs (for example 'IEDUrbanBig_Remote_Ammo') would always act as if they are armed with a pressure plate.

  • Added Remote ammo type for each vanilla IED class
  • Added Range ammo type for each vanilla IED class
  • Tided up the inheritance

@ulteq ulteq added the kind/bug-fix Release Notes: **FIXED:** label May 31, 2015
@ulteq ulteq added this to the 3.2.0 milestone May 31, 2015
@legman
Copy link
Contributor Author

legman commented Jun 6, 2015

This commit has made some use of the ACE_ExplodeOnDefuse parameter. Basicly I have set so that IED ammo types explode on defuse but this is based on the ExplodeOnDefuseChance (0.0 - 1.0) which is defined in the explosives module.

  • Using correct 'Pressure Plate' string
  • IEDs 'ACE_explodeOnDefuse' based on base chance (2%)
  • Added explosives module param 'ExplodeOnDefuseChance'
  • Added appropriate strings to table (need translation)

class ACE_Triggers {
SupportedTriggers[] = {"Command","DeadmanSwitch", "Cellphone", "PressurePlate"};

class IEDUrbanBig_Remote_Mag: DemoCharge_Remote_Mag {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The setup object has been removed for this.

@thojkooi
Copy link
Contributor

thojkooi commented Jun 6, 2015

Your indentation uses tabs. It should be 4 spaces.

@legman
Copy link
Contributor Author

legman commented Jun 6, 2015

That should be everything we discussed - let me know if there is anything else you want me to change!

@legman
Copy link
Contributor Author

legman commented Jun 6, 2015

Fixed indents :]

@legman
Copy link
Contributor Author

legman commented Jun 14, 2015

ready for merge 👍

@CorruptedHeart
Copy link
Member

Just recheck all the comments I made and ensure they have all been addressed.

@legman
Copy link
Contributor Author

legman commented Jun 14, 2015

done

@@ -540,6 +540,20 @@
<German>Entschärfungszeit für Nicht-Sprengstoffexperten erhöhen? Standard: Ja</German>
<Czech>Zvýšit čas potřebný k dokončení akce pokud není specialista? Výchozí: Ano</Czech>
</Key>
<Key ID="STR_ACE_Explosives_ExplodeOnDefuse_DisplayName">
<English>Explode on defusal?</English>
<Polish></Polish>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the empty stringtable entries. It makes it harder for our translators to find untranslated entries.

@legman
Copy link
Contributor Author

legman commented Jun 16, 2015

should be all good now!

nicolasbadano added a commit that referenced this pull request Jun 16, 2015
IED Class Inheritance Fixes
@nicolasbadano nicolasbadano merged commit 2afcf92 into acemod:master Jun 16, 2015
@nicolasbadano
Copy link
Contributor

Thanks!

@legman
Copy link
Contributor Author

legman commented Jun 16, 2015

my pleasure!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants