Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: othello777/DuckGnome
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.1.7.1-worksop
Choose a base ref
...
head repository: othello777/DuckGnome
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 7 commits
  • 13 files changed
  • 1 contributor

Commits on Oct 6, 2022

  1. dont need that

    othello777 committed Oct 6, 2022
    Copy the full SHA
    a612a64 View commit details
  2. extradontneedthat

    othello777 committed Oct 6, 2022
    Copy the full SHA
    6bd66be View commit details

Commits on Sep 2, 2023

  1. fixes issue #26

    othello777 committed Sep 2, 2023
    Copy the full SHA
    25554ea View commit details
  2. added catcarrier base

    othello777 committed Sep 2, 2023
    Copy the full SHA
    640ce95 View commit details
  3. added item list to readme

    othello777 committed Sep 2, 2023
    Copy the full SHA
    a58d954 View commit details

Commits on Sep 15, 2023

  1. added CatCarrier

    othello777 committed Sep 15, 2023
    Copy the full SHA
    bdf947b View commit details

Commits on Feb 11, 2025

  1. Copy the full SHA
    a7d0a04 View commit details
21 changes: 2 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,27 +1,10 @@
build/.vs/
build/.idea
build/obj/
build/othello7_mod.csproj.user
build/packages.config
build/packages/
othello7's_mod_compiled.dll
othello7's_mod_compiled.hash
Microsoft.Xna.Framework.Game.dll
Microsoft.Xna.Framework.Graphics.dll
build/app.manifest

#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
21 changes: 21 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -2,3 +2,24 @@
Congration, you have made it here.
`!warn ⚠️ this mod still has guns that are half-built and stuff that is a little broken.`
DuckGnome (DGn) is a little mod I made to add stuff I thought was cool.

### The weapons:
- Shootyself (Shoots copies of itself)
- Calamity Cannon
- Chaos Dart (utilizes Nerf Rival technology)
- TurboAK47
- Super Bazooka (automatic reloading = cool (and op))
- Flare Cannon
- Super Dueling Pistol (makes the worst gun in the game op)
- 360OP (instant win)
- OP Laser
- Rock Launcher
- Rock Sniper
- Death Pistol (death laser, but smol)
- fake sword
- shotgrenade (grenade shotgun)
### The Misc:
- Jesus Rock (use it and find out :P)
### The equipment:
- Iron Duck (protec)
- bomb chestplate (explodes everyone when shot)
75 changes: 0 additions & 75 deletions build/app.manifest

This file was deleted.

42 changes: 21 additions & 21 deletions build/othello7_mod.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--<Import Project="packages\ILRepack.2.0.18\build\ILRepack.props" Condition="Exists('packages\ILRepack.2.0.18\build\ILRepack.props')" />-->
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -16,41 +14,38 @@
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<Optimize>false</Optimize>
<OutputPath>../</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>..\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<Optimize>true</Optimize>
<OutputPath>../</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<NoWarn>MSB3884</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="CrashWindow">
<HintPath>/home/othello7/Desktop/SteamGames/Duck Game/CrashWindow.exe</HintPath>
<Reference Include="FNA">
<HintPath>ref/FNA.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="DuckGame">
<HintPath>/home/othello7/Desktop/SteamGames/Duck Game/DuckGame.exe</HintPath>
</Reference>
<Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>Microsoft.Xna.Framework.Game.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>Microsoft.Xna.Framework.Graphics.dll</HintPath>
<HintPath>ref/DuckGame.exe</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@@ -85,6 +80,8 @@
<Compile Include="src\susej.cs" />
<Compile Include="src\TurboAk47.cs" />
<Compile Include="src\SuperChestPlate.cs" />
<Compile Include="src\catcarrier.cs" />
<Compile Include="src\prototypemagblaster.cs" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
@@ -106,4 +103,7 @@
<Target Name="AfterBuild">
</Target>
-->
<Target Name="AfterBuild">
<Exec Command="cp -v $(SolutionDir)/../othello7_mod.dll /home/othello7/.config/DuckGame/Mods/DuckGnome/DuckGnome.dll " Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'" />
</Target>
</Project>
Binary file added build/ref/DuckGame.exe
Binary file not shown.
Binary file added build/ref/FNA.dll
Binary file not shown.
44 changes: 44 additions & 0 deletions build/src/catcarrier.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
using System;
namespace DuckGame.src
{
[EditorGroup("DuckGnome")]
public class catcarrier : Holdable, IPlatform
{
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(-4.5f, -6f);
this.collisionSize = new Vec2(18f, 14f);
this._holdOffset = new Vec2(-1f, -3f);
//this._bio = "Best prop in the game";
this._editorName = "Cat Carrier";
this.physicsMaterial = PhysicsMaterial.Plastic;
}

public override void OnPressAction()
{
if (this.duck == null)
return;

this.duck.ThrowItem();
this.velocity = new Vec2(velocity.x * 8, velocity.y);
//DevConsole.Log("CCVelocity: " + this.velocity.ToString());
}

public override void OnImpact(MaterialThing with, ImpactedFrom from)
{
if (Math.Abs(velocity.x) > 4f)
{
if (with is Duck)
{
((Duck)with).Kill(new DTImpact(this));
SFX.Play((GetPath("SFX\\gmoddeath.wav")), 20f, 0.0f, 0.0f, false);
}
SFX.Play((GetPath("SFX\\gmodhit.wav")), 20f, 0.0f, 0.0f, false);
}
base.OnImpact(with, from);
}
}
}
1 change: 0 additions & 1 deletion build/src/othello7_mod.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Windows.Forms;
using System.Threading;
using System.Collections;
using System.Collections.Generic;
38 changes: 38 additions & 0 deletions build/src/prototypemagblaster.cs
Original file line number Diff line number Diff line change
@@ -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;
}

}
}
7 changes: 7 additions & 0 deletions build/src/susej.cs
Original file line number Diff line number Diff line change
@@ -31,6 +31,13 @@ public susej(float xpos, float ypos) : base(xpos, ypos)

public override void OnPressAction()
{
if((this.owner is WireMount))
DevConsole.Log("susej: Sorry, I'll implement this later");

if (this.duck == null)
return;


SFX.Play((GetPath("SFX\\susejchoir.wav")), 20f, 0.0f, 0.0f, false);
Profile profile = DevConsole.ProfileByName("player" + Rando.Int(1, 4));
bool loop = true;
Binary file added content/SFX/gmoddeath.wav
Binary file not shown.
Binary file added content/SFX/gmodhit.wav
Binary file not shown.
Binary file added content/catcarrier.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.