Merge https://github.com/FGMEMBERS/IDG-A32X

CONTRIBUTING.md

@@ -0,0 +1,47 @@
+# IDG Contributing Guidelines
+
+These examples will show the IDG Guidelines for contributing. Please follow this at all times, or your contribution will not be merged.
+
+## Basic Guidelines:
+- Use Tabs to indent code, DO NOT USE SPACE.
+- Use lowerCamelCase or underscores for naming Nasal variables/functions (someFunction, some_function).
+- Comments optional for XML, mandatory for Nasal.
+- Do not add a comment to every line, only to functions/groups of code.
+- Remove .ac or .bak files, unless absolutely needed.
+- Leave one extra line at the bottom of each file.
+
+## Formatting Guidelines:
+Indenting and Line Breaks:
+```
+<!-- XML -->
+<something>
+	<something-else>0</something-else>
+	<something-more>
+		<more-stuff></more-stuff>
+	</something-more>
+</something>
+```
+
+```
+# Nasal
+var something = func {
+	somethingElse();
+}
+```
+Brackets, Spaces, Commas, Semi-Colons, and Parentheses:
+```
+var something = 0;
+var someOtherThing = func {
+	if (something == 1) {
+		something = 0;
+	} else {
+		something = 1;
+	}
+	settimer(func {
+		setprop("/something", something);
+	}, 5);
+}
+```
+
+## Forks, Branches, and Merging
+We do not add contributors outside of IDG, so please fork the repository, and commit your changes there. Branches are optional. When you are ready for IDG to look over you work, submit a pull request, following our pull request template, and an IDG Developer will look over it. If there is an issue that needs to be resolved before merging, the IDG Developer will leave a comment on the pull request.

ISSUE_TEMPLATE.md

@@ -0,0 +1,20 @@
+Issue tracker is **ONLY** used for reporting bugs/issues. **NO NEW FEATURES SUGGESTIONS!**
+
+<!--- Provide a general summary of the issue in the title above. -->
+
+### Expected Behavior
+<!--- Tell us what should happen. -->
+
+### Current Behavior
+<!--- Tell us what happens instead of the expected behavior. -->
+
+### Possible Solution
+<!--- Think you have a solution? Let us know! -->
+
+### Steps to Reproduce
+<!--- Provide a link to a live example, or a set of steps to reproduce -->
+<!--- this bug. Issue will be closed/ignored if missing. -->
+1.
+2.
+3.
+4.

Nasal/fire.nas

@@ -138,47 +138,43 @@ var master_fire = func {
 	}
 	
 	if (test2 and state == 0) {
-		setprop("/controls/fire/cargo/fwdsmokeLight", 1);
-		setprop("/controls/fire/cargo/warnfwd", 1);
-		settimer(func(){
-			setprop("/controls/fire/cargo/fwdsmokeLight", 0);
-			setprop("/controls/fire/cargo/warnfwd", 0);
-			setprop("/controls/fire/cargo/test/state", 1);
-		}, 0.5);
-	} else if (test2 and state == 1) {
-		setprop("/controls/fire/cargo/aftsmokeLight", 1);
-		setprop("/controls/fire/cargo/warnaft", 1);
-		settimer(func(){
-			setprop("/controls/fire/cargo/aftsmokeLight", 0);
-			setprop("/controls/fire/cargo/warnaft", 0);
-			setprop("/controls/fire/cargo/test/state", 2);
-		}, 0.5);
-	} if (test2 and state == 2) {
-		setprop("/controls/fire/cargo/fwdsmokeLight", 1);
-		setprop("/controls/fire/cargo/warnfwd", 1);
-		settimer(func(){
-			setprop("/controls/fire/cargo/fwdsmokeLight", 0);
-			setprop("/controls/fire/cargo/warnfwd", 0);
-			setprop("/controls/fire/cargo/test/state", 3);
-		}, 0.5);
-	} else if (test2 and state == 3) {
-		setprop("/controls/fire/cargo/aftsmokeLight", 1);
-		setprop("/controls/fire/cargo/warnaft", 1);
-		settimer(func(){
-			setprop("/controls/fire/cargo/aftsmokeLight", 0);
-			setprop("/controls/fire/cargo/warnaft", 0);
-			setprop("/controls/fire/cargo/test/state", 4);
-		}, 0.5);
-	} else if (test2 and state == 4) {
 		setprop("/controls/fire/cargo/fwddischLight", 1);
 		setprop("/controls/fire/cargo/aftdischLight", 1);
 		settimer(func(){
 			setprop("/controls/fire/cargo/fwddischLight", 0);
 			setprop("/controls/fire/cargo/aftdischLight", 0);
+			setprop("/controls/fire/cargo/test/state", 1);
+		}, 5);
+	} else if (test2 and state == 1) {
+		setprop("/controls/fire/cargo/fwdsmokeLight", 1);
+		setprop("/controls/fire/cargo/warnfwd", 1);
+		setprop("/controls/fire/cargo/aftsmokeLight", 1);
+		setprop("/controls/fire/cargo/warnaft", 1);
+		settimer(func(){
+			setprop("/controls/fire/cargo/fwdsmokeLight", 0);
+			setprop("/controls/fire/cargo/aftsmokeLight", 0);
+			setprop("/controls/fire/cargo/warnfwd", 0);
+			setprop("/controls/fire/cargo/warnaft", 0);
+			setprop("/controls/fire/cargo/test/state", 2);
+		}, 5);
+	} else if (test2 and state == 2) {
+		settimer(func(){
+			setprop("/controls/fire/cargo/test/state", 3);
+		}, 5);
+	} else if (test2 and state == 3) {
+		setprop("/controls/fire/cargo/fwdsmokeLight", 1);
+		setprop("/controls/fire/cargo/warnfwd", 1);
+		setprop("/controls/fire/cargo/aftsmokeLight", 1);
+		setprop("/controls/fire/cargo/warnaft", 1);
+		settimer(func(){
+			setprop("/controls/fire/cargo/fwdsmokeLight", 0);
+			setprop("/controls/fire/cargo/aftsmokeLight", 0);
+			setprop("/controls/fire/cargo/warnfwd", 0);
+			setprop("/controls/fire/cargo/warnaft", 0);
 			setprop("/systems/fire/cargo/test", 0);
 			setprop("/controls/fire/cargo/test", 0);
 			setprop("/controls/fire/cargo/test/state", 0);
-		}, 0.5);
+		}, 5);
 	}
 	
 	

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+<!-- Give a brief summary of your changes. -->
+
+### Description of Changes
+<!--- Describe your changes in detail. -->
+
+### Screenshots (optional)
+
+### Bugs fixed (if any)
+<!-- If you fixed any bugs, describe them here. State issue number if applicable. -->
+
+### Checklist:
+<!-- [ ] = Unchecked, [x] = Checked. -->
+* [ ] My changes follow the Contributing Guidelines. <!-- See CONTRIBUTING.md to verify. -->
+* [ ] My changes implement realistic features. <!-- Only aircraft changes require this. -->
+* [ ] Please have an IDG Developer test my changes before merging.
+* [x] My changes are ready for merging. <!-- Uncheck if you want to decide when to merge. -->

revision.txt

@@ -1 +1 @@
-2121
+2122