Merge pull request #31 from disseminate/development/all

Development/all

Author: disseminate

CONTRIBUTING.md

@@ -8,7 +8,7 @@ All strings that the player sees must be internationalized (see [I18](#i18)).
 
 ## Mapping
 
-Use the `coi.fgd` provided in this repository.
+Use the `coi.fgd` provided in this repository. In addition, the `.vmf` for `coi_test` is provided in `content/maps` (needs CS:S content).
 
 ### coi_truck
 
@@ -20,4 +20,4 @@ Place these in the vault. You can put any number of these in, as long as there's
 
 ## I18
 
-If you'd like to translate the gamemode, you are welcome! Look at `gamemode/i18/en.lua` as a starting point. The language code (`en`) will be what's displayed, according to the Garry's Mod main menu language selection.
+If you'd like to translate the gamemode, you are welcome! Look at `gamemode/i18/en.lua` as a starting point. Whatever language the client has set (`en`, `fr` etc.) will be what's displayed, according to the Garry's Mod main menu language selection.

README.md

@@ -2,6 +2,8 @@
 
 You, and your team of 3 other people, are set to rob the Urbanopolis National Bank. Unfortunately, there's been a bit of a mixup, so every other bank robbery crew in the city is also planning to rob it at the same time. It's your job to secure your team's financial future against these meddling rivals by meddling with your rivals, be it via killing them, setting traps, or alerting other players.
 
+<img src="docs/media/1.jpg" width="30%"> <img src="docs/media/2.jpg" width="30%"> <img src="docs/media/3.jpg" width="30%">
+
 ## Installation
 
 Checkout this repository to `garrysmod/garrysmod/gamemodes`.

docs/index.html

@@ -34,7 +34,7 @@ <h2><div class="hbar"></div>Capitalism Kills<div class="hbar"></div></h2>
 			<div class="img-row-3">
 				<a href="media/1.jpg"><img src="media/1.jpg" alt="Conflict of Interest" class="img-3" /></a>
 				<a href="media/2.jpg"><img src="media/2.jpg" alt="Conflict of Interest" class="img-3" /></a>
-				<a href="media/3.png"><img src="media/3.png" alt="Conflict of Interest" class="img-3" /></a>
+				<a href="media/3.jpg"><img src="media/3.jpg" alt="Conflict of Interest" class="img-3" /></a>
 			</div>
 		</div>
 	</section>

docs/media/3.jpg

@@ -61,6 +61,8 @@ function GM:HUDPaint()
 
 	if( self:GetState() == STATE_GAME ) then
 
+		self:HUDPaintUnconsciousness();
+
 		self:HUDPaintMoney();
 		self:HUDPaintPlayers();
 		self:HUDPaintCops();
@@ -70,8 +72,6 @@ function GM:HUDPaint()
 		self:HUDPaintDirectionArrow();
 		self:HUDPaintGetToTruck();
 
-		self:HUDPaintUnconsciousness();
-
 	end
 
 	self:HUDPaintGameOver();

docs/media/3.png

@@ -19,9 +19,9 @@ function GM:CreateLoadoutPanel()
 		local l = self:CreateLabel( p1, LEFT, "COI Title 64", I18( "select_loadout" ), 7 );
 		local p2 = self:CreatePanel( p1, RIGHT, 200, 0 );
 		p2:DockPadding( 0, 17, 0, 17 );
-			local l = self:CreateLabel( p2, TOP, "COI 16", "Conflict of Interest β", 9 );
+			local l = self:CreateLabel( p2, TOP, "COI 16", "Conflict of Interest " .. COI_VERSION, 9 );
 			l:SetTextColor( Alpha( self:GetSkin().COLOR_WHITE, 0.7 ) );
-			local l = self:CreateLabel( p2, TOP, "COI 14", "Everything subject to change.", 9 );
+			local l = self:CreateLabel( p2, TOP, "COI 14", "by disseminate", 9 );
 			l:SetTextColor( Alpha( self:GetSkin().COLOR_WHITE, 0.6 ) );
 
 	local p1 = self:CreatePanel( self.Loadout, BOTTOM, 0, 68 );
@@ -484,7 +484,7 @@ function GM:CreateLoadoutPanel()
 						net.SendToServer();
 
 						local mdl = GAMEMODE:CreateModelPanel( self, FILL, 0, 0, item.Model, Vector( 50, 50, 20 ), nil, 20 );
-						GAMEMODE:CreateLabel( mdl, FILL, "COI 18", item.Name, 3 ):DockMargin( 0, 0, 4, 4 );
+						GAMEMODE:CreateLabel( mdl, FILL, "COI 18", item.Name, 3 ):DockMargin( 4, 4, 4, 4 );
 						mdl.Item = v;
 						mdl:Droppable( "item" );
 						function mdl.DoClick( mdl )
@@ -626,8 +626,11 @@ function GM:ResetLoadoutInventory()
 			local ih = item.H * i.IconSize;
 			mdl = self:CreateModelPanel( i, NODOCK, iw, ih, item.Model, Vector( 50, 50, 20 ), nil, 20 );
 			mdl:SetPos( ( v.X - 1 ) * i.IconSize, ( v.Y - 1 ) * i.IconSize );
-			
-			self:CreateLabel( mdl, FILL, "COI 18", item.Name, 3 ):DockMargin( 0, 0, 4, 4 );
+		
+			self:CreateLabel( mdl, BOTTOM, "COI 18", item.Name, 3 ):DockMargin( 0, 0, 4, 4 );
+			local l = self:CreateLabel( mdl, BOTTOM, "COI 14", item.Secondary and "Secondary" or "Primary", 3 );
+			l:DockMargin( 0, 4, 4, 0 );
+			l:SetTextColor( self:GetSkin().COLOR_GRAY );
 
 			mdl.Item = k;
 			mdl:Droppable( "item" );

gamemode/cl_hud.lua

@@ -1,3 +1,5 @@
+-- en: English
+
 EXPORTS["en"] = {
 	["press_space"] = "Press Space",
 	["cop"] = "Cop",
@@ -44,5 +46,7 @@ EXPORTS["en"] = {
 	["wrong_truck"] = "Wrong truck! You're looking for the truck with the same color as",
 
 	["you_earned"] = "You earned",
-	["for_your_team"] = "for your team"
+	["for_your_team"] = "for your team",
+
+	["first_message"] = "Get money from the bank and return it to your truck!"
 };

gamemode/cl_loadout.lua

@@ -10,4 +10,6 @@ STATE_TIMES = {
 
 TEAM_UNJOINED = 999;
 
-NET_MAX_BAG_MONEY = 10; -- max $2^10 in one bag
+NET_MAX_BAG_MONEY = 10; -- max $2^10 in one bag
+
+COI_VERSION = "RC1";

gamemode/i18/en.lua

@@ -78,6 +78,17 @@ function GM:StateThink()
 
 		end
 
+		if( s == STATE_GAME ) then
+
+			if( self:GetSetting( "showed_first_message", 0 ) == 0 ) then
+
+				self:SetSetting( "showed_first_message", 1 );
+				chat.AddText( GAMEMODE:GetSkin().COLOR_WHITE, I18( "first_message" ) );
+
+			end
+
+		end
+
 	end
 
 	if( s == self.CacheState ) then