Skip to content

Commit

Permalink
cleaned up to work well building for DGR
Browse files Browse the repository at this point in the history
  • Loading branch information
othello777 committed Feb 11, 2025
1 parent bdf947b commit a7d0a04
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 42 deletions.
20 changes: 1 addition & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
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>
Expand All @@ -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" />
Expand Down Expand Up @@ -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\" />
Expand All @@ -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.
2 changes: 1 addition & 1 deletion build/src/catcarrier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
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;
Expand Down
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;
}

}
}

0 comments on commit a7d0a04

Please sign in to comment.