diff --git a/.gitignore b/.gitignore index fac68e2..a427d7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,10 @@ build/.vs/ +build/.idea build/obj/ build/othello7_mod.csproj.user build/packages.config build/packages/ build/app.manifest -othello7's_mod_compiled.dll -othello7's_mod_compiled.hash -Microsoft.Xna.Framework.Game.dll -Microsoft.Xna.Framework.Graphics.dll #bleh, build stuff -CrashWindow.exe -CrashWindow.exe.config -CrashWindow.pdb -DGInput.dll -DGInput.pdb -DGSteam.dll -DGSteam.pdb -DuckGame.exe -DuckGame.exe.config -DuckGame.pdb -Microsoft.Xna.Framework.dll -NAudio.dll -NAudio.xml -NVorbis.NAudioSupport.dll -NVorbis.dll othello7_mod.dll diff --git a/build/othello7_mod.csproj b/build/othello7_mod.csproj index 88c41c6..37ccdec 100644 --- a/build/othello7_mod.csproj +++ b/build/othello7_mod.csproj @@ -1,7 +1,5 @@  - - Debug x86 @@ -16,41 +14,38 @@ + x86 true - ..\ - DEBUG;TRACE full - x86 + false + ../ + DEBUG;TRACE prompt + 4 MinimumRecommendedRules.ruleset + - ..\ - TRACE - true - pdbonly x86 + true + ../ + TRACE prompt + 4 MinimumRecommendedRules.ruleset + MSB3884 - - /home/othello7/Desktop/SteamGames/Duck Game/CrashWindow.exe + + ref/FNA.dll + false - /home/othello7/Desktop/SteamGames/Duck Game/DuckGame.exe - - - False - Microsoft.Xna.Framework.Game.dll - - - False - Microsoft.Xna.Framework.Graphics.dll + ref/DuckGame.exe + false - @@ -85,6 +80,8 @@ + + @@ -106,4 +103,7 @@ --> + + + diff --git a/build/ref/DuckGame.exe b/build/ref/DuckGame.exe new file mode 100644 index 0000000..7666b52 Binary files /dev/null and b/build/ref/DuckGame.exe differ diff --git a/build/ref/FNA.dll b/build/ref/FNA.dll new file mode 100644 index 0000000..cad8945 Binary files /dev/null and b/build/ref/FNA.dll differ diff --git a/build/src/catcarrier.cs b/build/src/catcarrier.cs index 6397ae9..501af9f 100644 --- a/build/src/catcarrier.cs +++ b/build/src/catcarrier.cs @@ -9,7 +9,7 @@ public catcarrier(float xval, float yval) : base(xval, yval) //this.ammo = 1; this.graphic = new Sprite(this.GetPath("catcarrier.png")); this.center = new Vec2(6f, 6f); - this.collisionOffset = new Vec2(-4f, -6f); + this.collisionOffset = new Vec2(-4.5f, -6f); this.collisionSize = new Vec2(18f, 14f); this._holdOffset = new Vec2(-1f, -3f); //this._bio = "Best prop in the game"; diff --git a/build/src/othello7_mod.cs b/build/src/othello7_mod.cs index a9d6ef1..548fa09 100644 --- a/build/src/othello7_mod.cs +++ b/build/src/othello7_mod.cs @@ -1,5 +1,4 @@ using System; -using System.Windows.Forms; using System.Threading; using System.Collections; using System.Collections.Generic; diff --git a/build/src/prototypemagblaster.cs b/build/src/prototypemagblaster.cs new file mode 100644 index 0000000..2c76a53 --- /dev/null +++ b/build/src/prototypemagblaster.cs @@ -0,0 +1,38 @@ +using System; +namespace DuckGame.src +{ + public class prototypemagblaster : Gun + { + public prototypemagblaster(float xval, float yval) + : base(xval, yval) + { + ammo = 12; + _ammoType = new ATMag + { + penetration = 0.4f, + range = 470f, + rangeVariation = 70f, + accuracy = 0.2f + }; + wideBarrel = true; + barrelInsertOffset = new Vec2(3f, 1f); + _type = "gun"; + this.graphic = new Sprite(this.GetPath("prototypemag.png")); + center = new Vec2(12f, 8f); + collisionOffset = new Vec2(-8f, -7f); + collisionSize = new Vec2(16f, 14f); + _barrelOffsetTL = new Vec2(20f, 5f); + _fireSound = "magShot"; + _kickForce = 6f; + _fireRumble = RumbleIntensity.Kick; + _holdOffset = new Vec2(1f, 0f); + _numBulletsPerFire = 6; + loseAccuracy = 0.2f; + maxAccuracyLost = 0.12f; + _editorName = "Prototype Mag Blaster"; + editorTooltip = "The extra preferred gun for enacting justice in a post-apocalyptic megacity."; + physicsMaterial = PhysicsMaterial.Metal; + } + + } +}