Commit graph

89 commits

Author SHA1 Message Date
Walter Julius Hennecke
b0e877559f Sync with rpgxef-repo 2012-11-11 14:00:08 +01:00
Harry Young
c351237659 Sync witg rpgxef-repo
added a new MMB to the list

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-11 13:37:05 +01:00
Harry Young
970cd5d2aa sync g_combat.c from rpgxef-repo
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-11 00:16:35 +01:00
Harry Young
da904d7b9f Map to test some issues with the breakable.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-10 15:15:50 +01:00
Walter Julius Hennecke
20499cb401 Sync with rpgxEF repo 2012-11-10 13:40:29 +01:00
Harry Young
78498591ac finished work on Borg-MMBRefit
(had I known only the vinculum was left, lol ^^)
commented old code on borg4-6

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-10 10:45:48 +01:00
Harry Young
fbd834f234 Lua Stuff
fixed a bug in game.print that would not make the string appear
added a new function entity.MMBRefit that will fit misc_model_breakables on SP maps only (made sure of that) with splashDamage, splashRadius and material/s.powerups
I will extend and tune this one as nessessary for other models
The Borg Maps already make use of this new feature, along with some minor fixes.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-10 02:42:15 +01:00
Harry Young
817c42ad60 Fixes to selfdestruct
selfdestructcountdown wouldn't blow. Moved safezonetrigger to 0.1 secs and at another position, to compensate.
selfdestructcountdown will no longer play no futher audiowarning sounds

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-06 20:21:42 +01:00
Harry Young
c6d05d2a01 More work on selfdestruct
Added a new command selfdestructcountdown duration [safezone] [target]
It'll do exactly the same as selfdestruct start with the exception that it'll force the entity to think every 0.1 secs. to not do this accidently It got it's own command.
It uses the cp-command for display and disables admin_centerprint autoamtically.

On a more general selfdestruct note I got rid of those long warning sentences in favour of ^1Self Destruct in %.0f:%2.0f

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-06 19:46:42 +01:00
Harry Young
cce9d43552 Cleanup on SQL flag-values
Put the commands for client parameter manipulation and sound/music in one flag each.
Used the now empty flags to add in shiphealth etc. and debugging tools

added missing ')' in selfdestruct command
also fixed a compiler warning for a possibly undefined variable in shiphealth command

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-03 02:00:19 +01:00
Harry Young
8fac1cdae5 minor fix
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-02 22:59:34 +01:00
Harry Young
a95dadc61e New command safezonelist + fix
New command safezonelist that lists all safezones in existance.
It returns their targetnames, state (safe/unsafe) and theuir shipflag.
Minor fix to target_shiphealth so it now frees than links when there are missing parameters.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-02 22:43:43 +01:00
Harry Young
2c6fd91ace Work on Shiphealth, Safezone, Selfdestruct
Modified all of them to bertter support maps like rpg_runabout with more than one ship
both selfdestruct and shiphealth now allow for a safezones targetname to be added that is freed before called to list
that required modifications to the associated commands.
Now selfdestruct start asks for a safezone as it's 2nd to last argument and requires it if any safezone is spawnflaged as SHIP
shipdamage now has a 2nd argument that specifies the healthEnt it shall deal to. It requires that argument if it finds at least 2 healthEnts
shiphealth now displays the status of all healthEnts that exist and displays it's targetname in line one of the output
There ar also a few other things associated with this (e.g. healthEnt now frees at spawn if it misses required parameters)

Expanded description of target_safezone

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-31 20:54:04 +01:00
Harry Young
1be690019c Added a usefunction to safezones that either toggles it 1/0 or adds it to the list 50ms before either entity blows.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-26 14:19:08 +02:00
Walter Julius Hennecke
9c63510b62 Forgot to save g_target.c 2012-10-26 13:35:24 +02:00
Walter Julius Hennecke
7693b09407 Moved self destruct safe zones list into level locals 2012-10-26 13:33:49 +02:00
Walter Julius Hennecke
ea3763fe53 Cleanup 2012-10-26 13:23:55 +02:00
Walter Julius Hennecke
b37ae04858 Updated sqlite3 to newer version 2012-10-24 13:17:34 +02:00
Walter Julius Hennecke
0968fb8dd2 Update game/g_public.h 2012-10-24 14:06:35 +03:00
Walter Julius Hennecke
c44ad25442 Cleanup 2012-10-19 13:23:22 +02:00
Walter Julius Hennecke
003ae75b3c More reformating and cleanup 2012-10-17 16:27:41 +02:00
Walter Julius Hennecke
0a3edff976 reformating and cleanup
- reformated code for readability
- removed old/unused code
2012-10-17 16:07:35 +02:00
Walter Julius Hennecke
542fb5c8fe Cleanup
- removed old/unused commented code
- removed unused cvars in cgame
2012-10-17 13:50:09 +02:00
Harry Young
aa801834af Fixes to FX-System
fixed drip-entity (was stowing duration in wrong state-var)
fixed defaultstate for chunks-entity (material was 0 = none, fixed to 1 = metal)
disabled spawnfunction for all non-functional SP-Ports (I might look into them gain... maybe I just need to find their shaders)

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-15 14:51:25 +02:00
Walter Julius Hennecke
1357097a35 Sync with rpgxEF Repo 2012-10-15 13:17:19 +02:00
Harry Young
0eec649b90 Addition to selfdestruct to interconnect with healthent
selfdestruct will now look out for a healthEnt and - if found - will rig it for a kill and call it's usefunction, which will do all the killing instead.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-09 16:22:40 +02:00
Harry Young
2ac7330d45 addition to shipdamage command to abort if the ship is destroyed.
This commit is free to be pulled to the other 2 repos

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-08 16:45:09 +02:00
Harry Young
31d4c595c4 fixed the issue with the last commit by building a failsave around the entire use-function's math segment.
I don't know why I'm calling this at this point...

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-08 10:42:20 +02:00
Harry Young
ae23187eed More work on target_shiphealth
made target_alert toggle the shields automatically and appropriately
however if you toggle red alert (even just for audio) at low hull it blows up the ship
minor alteration to selfdestruct command description

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-08 01:30:29 +02:00
Harry Young
76f21155bd 2 minor things
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-04 23:43:47 +02:00
Harry Young
9642e186b2 Addition to shiphealth system
added another layer of shield indicator (-2) to the system. Indicators are now
offline (-2, shields are not charged)
inoperable (-1 shield emiters destroyed)
standing by (0, shields charged, no alert ongoing)
online (1, shields charged, alert ongoing)
Also eased off on the shiphealth command

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-04 02:18:06 +02:00
Harry Young
bf476a80d8 Finished work on the first complete version of shiphealth
Turned out simply using '/' for divisions didn't do the trick so i tried '* pow(x, -1)' instead and it got all my issues working ^^
Also added a functionality that selects colors for the appropriate condition of shields and hull.
Added the failsave-functionality to the entity for shield reenstatement

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-09-30 20:20:05 +02:00
Harry Young
695cfa6067 More work on shiphealth
Tried to replace some int's and float's with double's, no negative effect however the bugs still exist.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-09-28 15:52:56 +02:00
Harry Young
eb0669507c Continued work on shiphealth.
Bit of restructuring in the command.
Fixes to the entity so it will fire all systems.
Need to look in the random-functions. The systems are firing out every hit.
Also relative Strength does not work in Shiphealth command (gives either 100 or 0)
Aditionally forced SD-Killmode active with the target merely being for FX.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-09-28 02:31:05 +02:00
Walter Julius 'GSIO01' Hennecke
6bde5fb79e Sync with rpgxEF repo ...
How long will we keep syncing these back?
2012-09-10 21:29:23 +02:00
Walter Julius 'GSIO01' Hennecke
350a734c14 Updated .gitignore with github defualt .gitignore 2012-09-07 17:10:02 +02:00
Walter Julius Hennecke
28f8cde337 Makefile update 2012-08-04 10:05:27 +02:00
Walter Julius Hennecke
b60d5c353e Update game/Makefile
x86_64 to x64 for Windows
2012-08-04 10:43:35 +03:00
Walter Julius Hennecke
e06aadb9d3 Update cgame/Makefile
x86_64 to x64 for Windows
2012-08-04 10:42:58 +03:00
Walter Julius Hennecke
5767df99e6 Fixed a minor bug in two Makefiles 2012-08-03 22:07:52 +02:00
Walter Julius Hennecke
69caaa5b03 Updated make files
- added cross compiling support with mingw32-64
- added windows 64bit support (only with cross compiling)
2012-08-03 21:50:58 +02:00
Harry Young
3153b9a2d6 Okay, all issues are resolved, the commands are in and the libs compile. All that's missing is the external file and a few failsaves. the latter I can do myself with some research, the first is outside my field of expertise.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-08-03 00:17:15 +02:00
Harry Young
fdd83d724b New target_shiphealth entity. I still need to do some debugging here, which I intend to do later tonight.
Minor tweaks.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-08-02 18:56:55 +02:00
Walter Julius Hennecke
45e4d5f31c Fixed a bug ...
... where on maps without target_safezone(s) player wouldn't die through
self destruct.
2012-08-01 21:28:56 +02:00
Walter Julius Hennecke
301fcf69ae Revert "Made all function in g_active.c static where possible"
This reverts commit 5c1777541d.
2012-08-01 20:55:38 +02:00
Walter Julius Hennecke
b8d249950a Revert "Made function static in g_breakable.c where possible"
This reverts commit 3dceb25e0b.
2012-08-01 20:55:34 +02:00
Walter Julius Hennecke
291bbfa0ee Revert "Made functions static where possible in g_target.c"
This reverts commit 973eb5cd23.
2012-08-01 20:55:19 +02:00
Walter Julius Hennecke
973eb5cd23 Made functions static where possible in g_target.c 2012-08-01 20:43:13 +02:00
Walter Julius Hennecke
3dceb25e0b Made function static in g_breakable.c where possible 2012-08-01 20:28:02 +02:00
Walter Julius Hennecke
5c1777541d Made all function in g_active.c static where possible 2012-08-01 20:21:39 +02:00